From 269c6567ae25170947e7f9d52b31df2c4d82cd94 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Tue, 26 Apr 2016 13:25:57 +0200
Subject: [PATCH] Fixed Health and XP bars bug for Marshmallow devices. Tested
 down to Donut on x86 VM.

---
 .../res/drawable/ui_bar_background.9.png        | Bin 216 -> 207 bytes
 .../res/drawable/ui_blue_foreground.9.png       | Bin 242 -> 222 bytes
 .../res/drawable/ui_green_foreground.9.png      | Bin 242 -> 223 bytes
 AndorsTrail/res/drawable/ui_progress_exp.xml    |  14 +++++++++++++-
 AndorsTrail/res/drawable/ui_progress_health.xml |  11 ++++++++---
 .../res/drawable/ui_purple_foreground.9.png     | Bin 244 -> 221 bytes
 .../res/drawable/ui_red_foreground.9.png        | Bin 244 -> 224 bytes
 .../res/drawable/ui_yellow_foreground.9.png     | Bin 255 -> 230 bytes
 8 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/AndorsTrail/res/drawable/ui_bar_background.9.png b/AndorsTrail/res/drawable/ui_bar_background.9.png
index 3a6ca9691e937ff7305e2bb2080e1080ae897b00..8a2dc406408283da75c6ae79a0a1e764c1ab3547 100644
GIT binary patch
delta 168
zcmcb?c%D(QGr-TCmrII^fq{Y7)59eQNOJ-)HwPP#TpPJudZL~|-2)a$ehICBzml#%
z!5B{$#}J9jy%P@d9x&iwUieDqW|L=y(e(K<TMoX^*2oMH`Ol*+>AXezAF~}pvbeDb
z!=)KF8HBkQu2lPbgtB|QpK~>8v6p{o2J1)OkgUGATRW?z1aIDo{rj@Srhd<DiT4i6
S{{9Er!{F)a=d#Wzp$Py(qdE@&

delta 177
zcmX@lc!N=|Gr-TCmrII^fq{Y7)59eQNOJ%&HwPP#beere6-Y4_2e~^jtUD+3a-yO^
z)h!MIK_T`hIZGRWQW2gmjv*44dncUbJ)pqhHs3crkz0Swp_uz7d~W)^f!Rs%hg#>`
zFr<CzJ$JOx$j_TeLFt;5rsiGSySA#OS8c7%zFBPX?!)SZYfc85#$JqKUU2PHUcv7b
a%KRc*C6)gkbDIscgTd3)&t;ucLK6T(L_M1T

diff --git a/AndorsTrail/res/drawable/ui_blue_foreground.9.png b/AndorsTrail/res/drawable/ui_blue_foreground.9.png
index 821b3060eee6217253dd3b479e704dda6f56d136..4821f41a9ac65de9d306bdb02f07c07da628a4ad 100644
GIT binary patch
delta 184
zcmeywc#l!BGr-TCmrII^fq{Y7)59eQNOJ-)HwPP#TpPJudZL~|{R0+BeqFW$BHIOk
zg4v!fjv*44lM@cG{FmI&`1AAgVuJ^aJtt(&&iGsq9Mt=*SX5NBHa!6d9K#l@IKqG3
z;P;%z<}(y^PN?mz_{O}t)W<@$Ygxy{2}(Ok?f2OxCnQWra(J5jac<IuupL*wU$0EQ
iWl;Rghpmf&q1{M!!o1UbH+X^eGI+ZBxvX<aXaWFDGDU*`

delta 204
zcmcb|_=!=kGr-TCmrII^fq{Y7)59eQNOJ%&HwPP#beere6-Y4_2e~^jtUD+3a-yO^
z{VfgwK~V$Y3DZ1)QbnFFjv*44=k_XcH8_a4-0yOne0Q7K;&8+2Wp8J1t7x@tzqrhI
zjo8N8?nR3h{76VhXp`KbG<%)JbESO~!h4^DDl;6LA>lCBd9EtMm%A>};#>-M>_iV(
z=xo3G;O)1q0`ESbwqek0uXmUpSMu_y;g)Nkx<y4p<|w?Wp5Cbkw4TA!)z4*}Q$iB}
Du6#`A

diff --git a/AndorsTrail/res/drawable/ui_green_foreground.9.png b/AndorsTrail/res/drawable/ui_green_foreground.9.png
index 475a92dd90b079c0f325dd7dfa24d76aa718da5c..cd2a97468b21dd8c8b37573c9dae816204ca7db6 100644
GIT binary patch
delta 185
zcmeywc%M<RGr-TCmrII^fq{Y7)59eQNOJ-)HwPP#TpPJudZL~|{R0+BeqGD5qFK5?
z!5mK)#}J9j$q5Ho{!4CX{Q3ELvB3kzo)dGP6wfLM-on46NK{m`Ha!6d9K#l9Ea13a
za5eFp`3yy!6Kb~qKgz5w^|6rcTGlafg3^xC`}6-NBusGesHy+Qy!-v4ZCZ!c#yzW*
izuY#{INd0Kg<*!6?EHLwVaq(A#SEUVelF{r5}E*R-b6P5

delta 204
zcmcc5_=!=kGr-TCmrII^fq{Y7)59eQNOJ%&HwPP#beere6-Y4_2e~^jtUD+3a-yO^
z{VfgwK@sIX(`VO#QbnFFjv*44=k_Y{H5iCE-{)YG5wq-kY7z0y*xs?ME0($2<=mqg
zzd78P8d(l`XWd%Xsy(UXsAc$v*1DV}^3se3$EGm6l6mFDY@l!KY^~W~Q>)b=a5&er
zdUvhvljDD+l&<XF+4kekyFJs+Wmod7-TEg<lsQL0ky~e%7|41CPgg&ebxsLQ0NqeW
A5&!@I

diff --git a/AndorsTrail/res/drawable/ui_progress_exp.xml b/AndorsTrail/res/drawable/ui_progress_exp.xml
index a521618f0..878b2dc01 100644
--- a/AndorsTrail/res/drawable/ui_progress_exp.xml
+++ b/AndorsTrail/res/drawable/ui_progress_exp.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/background" android:drawable="@drawable/ui_bar_background">
+	<item android:id="@android:id/background">
+	    <nine-patch android:src="@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>
diff --git a/AndorsTrail/res/drawable/ui_progress_health.xml b/AndorsTrail/res/drawable/ui_progress_health.xml
index d481fa6e5..806ecc205 100644
--- a/AndorsTrail/res/drawable/ui_progress_health.xml
+++ b/AndorsTrail/res/drawable/ui_progress_health.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/background" android:drawable="@drawable/ui_bar_background">
+	<item android:id="@android:id/background">
+	    <nine-patch android:src="@drawable/ui_bar_background"/>
 	</item>
 	<item android:id="@android:id/secondaryProgress">
-		<clip android:drawable="@drawable/ui_bar_background" />
+	    <clip>
+	        <nine-patch android:src="@drawable/ui_bar_background"/>
+	    </clip>
 	</item>
 	<item android:id="@android:id/progress">
-		<clip android:drawable="@drawable/ui_red_foreground" />
+	    <clip>
+	        <nine-patch android:src="@drawable/ui_red_foreground" />
+	    </clip>
 	</item>
 
 <!--
diff --git a/AndorsTrail/res/drawable/ui_purple_foreground.9.png b/AndorsTrail/res/drawable/ui_purple_foreground.9.png
index 350a2f0152ff808b8e221c2d32a31e1e28e89733..9a4caeefb664117b4e73d0304cd1ab944e56bcc3 100644
GIT binary patch
delta 183
zcmeyuc$ZPJGr-TCmrII^fq{Y7)59eQNOJ-)HwPP#TpPJudZL~|{R0+Bem%qB7RNh4
z!7NV~#}J9j$q5Ho{!4CX{Q3ELvB3kzo)dF2XFY$o?2pIY^PwRjU*<Lf0c#}VekFUS
z<2lFk4V)t;`2PC&h&}A}i~=hWUqNL>*Miq^|0<3toKra3aOU`{-Bm}|7Oa+jU!8o*
hp!k^&TNeX^a-Hl?&qX!7B0y^yJYD@<);T3K0RRx|M->17

delta 206
zcmcc1_=QogGr-TCmrII^fq{Y7)59eQNOJ%&HwPP#beere6-Y4_2e~^jtUD+3a-yO^
z{VfgwK`|cjOFMahQYD@)jv*44=k^-%IXH;8-0x~SCAlqR*EH`P2d7P1`%UEB!jM-j
zK~M9)nsPZg?MYcxIkQo_>WLSJ;$!aIo7vIdxE{<o&3I;~P7dP%t94hLQyDHjzRYkW
zGH><C+i%qmGUym7M!Re~p>%ok-5Y+=w_hf|+$;WE+`7M6J-tgKnj7c<22WQ%mvv4F
FO#q+nPAdQa

diff --git a/AndorsTrail/res/drawable/ui_red_foreground.9.png b/AndorsTrail/res/drawable/ui_red_foreground.9.png
index 382058930427ee92513b5b5737da00c34274a3d6..f160a05fc2592cceed0d8087450b1c52c599bb62 100644
GIT binary patch
delta 186
zcmeyu_<&KdGr-TCmrII^fq{Y7)59eQNOJ-)HwPP#TpPJudZL~|{R0+BekmcZlZPXL
zg1Me9jv*44lM@cG{FmI&`1AAgVuJ^aJtyXT-ZrZs_#6AOB2iJ%TKB+`dtsmL_qQm;
z96m1oU6O}CK0PG?2pr8`9&Z<qSetz4Wq^rmPm9RGwbkEVvNwxNI<nc{e#7s))%%q0
jWWDeH&Uwqhih<#Qt!$mZmFOrhpv?@Pu6{1-oD!M<B1%TA

delta 206
zcmaFB_=QogGr-TCmrII^fq{Y7)59eQNOJ%&HwPP#beere6-Y4_2e~^jtUD+3a-yO^
z{VfgwK@kaiJO0l=sS-~Y#}J9jb9)W>92`Vk?sqkLY46eveZ;VC$KSAOF7*P2r9tXm
zA-8MKdU0@moRpcSW?bOfw9ewW(7p@iOTYMPG8~&B;xPBH&UJ=0pFQsKaw+i5=Q^PO
zIoGsmcdhP`<A1hPb|v`DuFu;(b=tN|pCqEP#eW{<W6V;>5|ZAw0O$Y)Pgg&ebxsLQ
E0F1jxx&QzG

diff --git a/AndorsTrail/res/drawable/ui_yellow_foreground.9.png b/AndorsTrail/res/drawable/ui_yellow_foreground.9.png
index ddb7cbdcb76b1a9249131b0acd280602ddc77ea4..16c7a235b887be450f15731876576bca0e2cc47f 100644
GIT binary patch
delta 192
zcmey*_>57pGr-TCmrII^fq{Y7)59eQNOJ-)HwPP#TpPJudZL~|{R0+BetiSm84lb)
z!D3Gr#}J9j$q5Ho{!4CXd@Gz|De-~9E#=(7o$CsM=k57%<miC|2LxhkKUphpV)Dz&
z+|l+ve!kHS_4jEh2|(az_VW6A{)n~7hh7Glxc0P&99&!d`4@L{hlbOmv#<4U)NbE)
qSSYWw;Ao+bwBLL0#04B;3=DB!6}69r=bZrB&*16m=d#Wzp$P!v=SmU)

delta 217
zcmaFH_@7a)Gr-TCmrII^fq{Y7)59eQNOJ%&HwPP#beere6-Y4_2e~^jtUD+3a-yO^
z{cScGAttlKJ-5#RrRqIh977~7Cnq?t{$D5|nlnG)^g#z63ybSt{~z4B?!Tmjgv7LM
zvx<!jfI!K+sL0zG#H#uKYsx{pN^@mqAmF~@=f=jy))v3tE@8$gmlIKoL<~Uc_f-CE
zefa+UdY=0F`qYZgzqre;W?Sq0S6cse!=L`pPha+lux(;s(A}z@V9H#$4(JvJPgg&e
IbxsLQ0CmbuzyJUM