Revert "Fixed Health and XP bars bug for Marshmallow devices. Tested down to Donut on x86 VM."

This reverts commit 269c6567ae.

AndorsTrail/res/drawable/ui_progress_exp.xml

@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/background">
-	    <nine-patch android:src="@drawable/ui_bar_background"/>
+	<item android:id="@android:id/background" android:drawable="@drawable/ui_bar_background">
 	</item>
 	<item android:id="@android:id/secondaryProgress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_bar_background"/>
-	    </clip>
-	</item>
-	<item android:id="@android:id/progress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_yellow_foreground" />
-	    </clip>
-	</item>
-<!-- <item android:id="@android:id/secondaryProgress">
 		<clip android:drawable="@drawable/ui_bar_background" />
 	</item>
 	<item android:id="@android:id/progress">
 		<clip android:drawable="@drawable/ui_yellow_foreground" />
 	</item>
- -->
 </layer-list>

AndorsTrail/res/drawable/ui_progress_health.xml

@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/background">
-	    <nine-patch android:src="@drawable/ui_bar_background"/>
+	<item android:id="@android:id/background" android:drawable="@drawable/ui_bar_background">
 	</item>
 	<item android:id="@android:id/secondaryProgress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_bar_background"/>
-	    </clip>
+		<clip android:drawable="@drawable/ui_bar_background" />
 	</item>
 	<item android:id="@android:id/progress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_red_foreground" />
-	    </clip>
+		<clip android:drawable="@drawable/ui_red_foreground" />
 	</item>
 
 <!--