From bae7b97f825ad52c6f91e9e1224fa6828f15c849 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 7 Apr 2014 10:57:44 -0700
Subject: [PATCH] Quantum ActionBar, cleaning up theme colors

BUG: 13731184
Change-Id: Icca14b094dc1b7f4156306d14a7950b857bbe9c9
---
 .../drawable-hdpi/ab_bottom_solid_qntm_alpha.9.png | Bin 135 -> 0 bytes
 .../ab_bottom_transparent_qntm_alpha.9.png         | Bin 138 -> 0 bytes
 .../res/drawable-hdpi/ab_solid_qntm_alpha.9.png    | Bin 133 -> 0 bytes
 .../ab_stacked_solid_qntm_alpha.9.png              | Bin 141 -> 0 bytes
 .../ab_stacked_transparent_qntm_alpha.9.png        | Bin 140 -> 0 bytes
 .../drawable-hdpi/ab_transparent_qntm_alpha.9.png  | Bin 124 -> 0 bytes
 .../drawable-mdpi/ab_bottom_solid_qntm_alpha.9.png | Bin 117 -> 0 bytes
 .../ab_bottom_transparent_qntm_alpha.9.png         | Bin 120 -> 0 bytes
 .../res/drawable-mdpi/ab_solid_qntm_alpha.9.png    | Bin 117 -> 0 bytes
 .../ab_stacked_solid_qntm_alpha.9.png              | Bin 122 -> 0 bytes
 .../ab_stacked_transparent_qntm_alpha.9.png        | Bin 121 -> 0 bytes
 .../drawable-mdpi/ab_transparent_qntm_alpha.9.png  | Bin 111 -> 0 bytes
 .../ab_bottom_solid_qntm_alpha.9.png               | Bin 150 -> 0 bytes
 .../ab_bottom_transparent_qntm_alpha.9.png         | Bin 145 -> 0 bytes
 .../res/drawable-xhdpi/ab_solid_qntm_alpha.9.png   | Bin 149 -> 0 bytes
 .../ab_stacked_solid_qntm_alpha.9.png              | Bin 155 -> 0 bytes
 .../ab_stacked_transparent_qntm_alpha.9.png        | Bin 150 -> 0 bytes
 .../drawable-xhdpi/ab_transparent_qntm_alpha.9.png | Bin 142 -> 0 bytes
 .../ab_bottom_solid_qntm_alpha.9.png               | Bin 233 -> 0 bytes
 .../ab_bottom_transparent_qntm_alpha.9.png         | Bin 220 -> 0 bytes
 .../res/drawable-xxhdpi/ab_solid_qntm_alpha.9.png  | Bin 275 -> 0 bytes
 .../ab_stacked_solid_qntm_alpha.9.png              | Bin 218 -> 0 bytes
 .../ab_stacked_transparent_qntm_alpha.9.png        | Bin 218 -> 0 bytes
 .../ab_transparent_qntm_alpha.9.png                | Bin 205 -> 0 bytes
 core/res/res/drawable/ab_bottom_solid_quantum.xml  |  20 ------
 .../res/drawable/ab_bottom_transparent_quantum.xml |  21 ------
 core/res/res/drawable/ab_solid_quantum.xml         |  20 ------
 core/res/res/drawable/ab_stacked_solid_quantum.xml |  20 ------
 .../drawable/ab_stacked_transparent_quantum.xml    |  20 ------
 core/res/res/drawable/ab_transparent_quantum.xml   |  19 -----
 core/res/res/values/attrs.xml                      |   6 ++
 core/res/res/values/colors_quantum.xml             |  48 ++-----------
 core/res/res/values/styles_quantum.xml             |  79 ++++++++-------------
 core/res/res/values/themes_quantum.xml             |  42 ++++++-----
 34 files changed, 66 insertions(+), 229 deletions(-)
 delete mode 100644 core/res/res/drawable-hdpi/ab_bottom_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-hdpi/ab_bottom_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-hdpi/ab_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-hdpi/ab_stacked_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-hdpi/ab_stacked_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-hdpi/ab_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-mdpi/ab_bottom_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-mdpi/ab_bottom_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-mdpi/ab_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-mdpi/ab_stacked_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-mdpi/ab_stacked_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-mdpi/ab_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xhdpi/ab_bottom_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xhdpi/ab_bottom_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xhdpi/ab_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xhdpi/ab_stacked_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xhdpi/ab_stacked_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xhdpi/ab_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ab_bottom_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ab_bottom_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ab_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ab_stacked_solid_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ab_stacked_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ab_transparent_qntm_alpha.9.png
 delete mode 100644 core/res/res/drawable/ab_bottom_solid_quantum.xml
 delete mode 100644 core/res/res/drawable/ab_bottom_transparent_quantum.xml
 delete mode 100644 core/res/res/drawable/ab_solid_quantum.xml
 delete mode 100644 core/res/res/drawable/ab_stacked_solid_quantum.xml
 delete mode 100644 core/res/res/drawable/ab_stacked_transparent_quantum.xml
 delete mode 100644 core/res/res/drawable/ab_transparent_quantum.xml

diff --git a/core/res/res/drawable-hdpi/ab_bottom_solid_qntm_alpha.9.png b/core/res/res/drawable-hdpi/ab_bottom_solid_qntm_alpha.9.png
deleted file mode 100644
index 406bf58c96d094b2e68a7e5b9a7a37fe3cf10166..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^S{5)M8Ln>~)y<y13pvc2=;LrcP
zFO$`i%I73Zh`doJ7Nq(pC+p?^l(f=UGHl;O!_G3Xp@1^xu!QvoWd2)kc)RlULPLhd
XkvW^$I%dWJO=j?P^>bP0l+XkKWI`(&

diff --git a/core/res/res/drawable-hdpi/ab_bottom_transparent_qntm_alpha.9.png b/core/res/res/drawable-hdpi/ab_bottom_transparent_qntm_alpha.9.png
deleted file mode 100644
index 409d3cdc79dacfc9edf416574dbf8fed30bc6e46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^S0zF+ELn>~)y>yWCfCC4M!)p)e
zm;1Nvtq}@pU@z*~z;AEV6}oq7ywoz)?@MaBZO@u&=8E4BNI(PnItj}U*!&ONz~iku
Y^RWKDyi<ICfQB=8y85}Sb4q9e0D!MA-2eap

diff --git a/core/res/res/drawable-hdpi/ab_solid_qntm_alpha.9.png b/core/res/res/drawable-hdpi/ab_solid_qntm_alpha.9.png
deleted file mode 100644
index 9d7b25fa4b76d557c100df4fc92e1b0e07cac307..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^Sd^}woLn>~)y<y13puod?;NSm^
zf1U2S+!1M45<d~8m#utn*)+Qy*K~>{(7_GMH3#Y%UDLvrH^m;_wmh%>7{kkFsnQMJ
Sn!kbOGI+ZBxvX<aXaWHBHY+Ls

diff --git a/core/res/res/drawable-hdpi/ab_stacked_solid_qntm_alpha.9.png b/core/res/res/drawable-hdpi/ab_stacked_solid_qntm_alpha.9.png
deleted file mode 100644
index 1222711a6c3aeadea9d4e86eb93e663247d6032f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SLOfj@Ln>~)y<y13V8FrR`2T;R
z_TCc5pf(Zrh{R~gXyto-Zv5M3p0!)E`{|Xo(5Z8n*mxui5)L#lGQ$|s28_R1#b#<Q
iZ-_nIw|t%RMh0H5(AUSy?)wAHXYh3Ob6Mw<&;$S^{4GlW

diff --git a/core/res/res/drawable-hdpi/ab_stacked_transparent_qntm_alpha.9.png b/core/res/res/drawable-hdpi/ab_stacked_transparent_qntm_alpha.9.png
deleted file mode 100644
index d0fcc25c9239382f1e3a72674376ab5cbef0a612..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^Sf<0XvLn>~)y|Iz=fB}!IqwWMl
zBe!qzuXl52@#?i$9?m|>8M5=$8}HW#wmg}6WxoVExM8Q0u>F9W{D13}e81JM{x2|I
Z6Xj;LJ0zWB7dy~+22WQ%mvv4FO#pN$E%^Wd

diff --git a/core/res/res/drawable-hdpi/ab_transparent_qntm_alpha.9.png b/core/res/res/drawable-hdpi/ab_transparent_qntm_alpha.9.png
deleted file mode 100644
index 5fa4ec4168598265d5719d709f9cf6bba0be49cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SoIPC}Ln>~)y|Iv&!GMR^@%{c1
zuV^Vzmy3H->TaC8|LWE$E*><nhEsck?uIKH4&2(XXZgF9rwqR~{t;^WJV^m)9D}E;
KpUXO@geCxHi72N4

diff --git a/core/res/res/drawable-mdpi/ab_bottom_solid_qntm_alpha.9.png b/core/res/res/drawable-mdpi/ab_bottom_solid_qntm_alpha.9.png
deleted file mode 100644
index 219d3114b6be97ef3aad19578edb41c63266dab9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%Hl8kyAr-fh6BPLWv?pCUFkL_X
z-({i0vaaUc|1L}PM44n=T;aM{tQW*c*!1E*kkiSyllRB`V>1{T9L}jJ&r#mC185F|
Mr>mdKI;Vst0R3Sov;Y7A

diff --git a/core/res/res/drawable-mdpi/ab_bottom_transparent_qntm_alpha.9.png b/core/res/res/drawable-mdpi/ab_bottom_transparent_qntm_alpha.9.png
deleted file mode 100644
index bfdc933f18c3b0ed3c683d89e1b579cffd3009f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%_MR?|Ar-fh6BPLWv?mFb{{6q+
z+nc9cWWr%TZ=Y%JH91}dcDw0HZOyo{2+R->`zyaS!^BV_`pf)dGZ-0`gq)Ny(QJAR
PG>XB~)z4*}Q$iB}(l90=

diff --git a/core/res/res/drawable-mdpi/ab_solid_qntm_alpha.9.png b/core/res/res/drawable-mdpi/ab_solid_qntm_alpha.9.png
deleted file mode 100644
index bd818b5f73f7c5660f901733152adfc2b4add949..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%Hl8kyAr-fh6BPLWv?mFbUX(Z>
zYnpX&h3jIm-Y63Y<Klru{}+o*ly!f9Z|`q^Z=d?^2~sUv4)HJq%~U!(FMDwj&>RL&
LS3j3^P6<r_yR9eq

diff --git a/core/res/res/drawable-mdpi/ab_stacked_solid_qntm_alpha.9.png b/core/res/res/drawable-mdpi/ab_stacked_solid_qntm_alpha.9.png
deleted file mode 100644
index 41c7ce61631954bff69f4f367397b781b42dc068..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%j-D=#Ar-fh6BPLWv?mFbUX(Z>
z`}O<#`~SBbSuEBYWs-Gqg)5k$r2ET0OYmmlm%qQi10}y~=UD0Jp?!vdfvZo3IWp+>
QRG?uDp00i_>zopr0520PP5=M^

diff --git a/core/res/res/drawable-mdpi/ab_stacked_transparent_qntm_alpha.9.png b/core/res/res/drawable-mdpi/ab_stacked_transparent_qntm_alpha.9.png
deleted file mode 100644
index 961a73e5619bf23d09dfaf2ccc44d09bd547f5f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%4xTQKAr-fh6BPLWv?mFb{{4U6
z+ncBS$_m%TV!cr&Sr;J;7v}DN{ZTHSGMtx%l%rGpynF7j{qave!@!VQEnxa%o8=9l
OSqz@8elF{r5}E)QASVd`

diff --git a/core/res/res/drawable-mdpi/ab_transparent_qntm_alpha.9.png b/core/res/res/drawable-mdpi/ab_transparent_qntm_alpha.9.png
deleted file mode 100644
index 2e423865ee760b4100ab68f4378e1e3eb0a382a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%W}YsNAr-fh6BPLWv_EoW|JNU7
zl67%~>teB92xH5p7ynndrX0UmFU9;Ty5)+(645jU2Jf0LJkb#+>wqROc)I$ztaD0e
F0s!gqB_;p>

diff --git a/core/res/res/drawable-xhdpi/ab_bottom_solid_qntm_alpha.9.png b/core/res/res/drawable-xhdpi/ab_bottom_solid_qntm_alpha.9.png
deleted file mode 100644
index 312f76c047e41ba3eee20a8987f769d8a082d95c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nETSWg$nkcwMxZ|&q{FyLW!cyGVH
zdbzjYrKgOCIZY0%EO^>szjA5*q?uQD7Rv}saG#JRCx8=7SUrJ>k+E>AgM**K?Bg5q
adKo{P>wJw_VRam65re0zpUXO@geCye9V;#X

diff --git a/core/res/res/drawable-xhdpi/ab_bottom_transparent_qntm_alpha.9.png b/core/res/res/drawable-xhdpi/ab_bottom_transparent_qntm_alpha.9.png
deleted file mode 100644
index 49e0a49f9b89138e9f331350e4875adc2d13ebd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nET2u~NskcwMxuNZPMDDW^J_;>RE
ze%(C2b&C>qIy@_qjQXl}v+AXnQQbSK<-AKA9q@o(PE1TpkFpyZWSl-#W;3M}%v|w)
S=EGp19SokXelF{r5}E+>buPL9

diff --git a/core/res/res/drawable-xhdpi/ab_solid_qntm_alpha.9.png b/core/res/res/drawable-xhdpi/ab_solid_qntm_alpha.9.png
deleted file mode 100644
index fb0d0b6b541912f709d5e41aa833cd28fea1c8a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nET7*7|+kcwMxZ*AmcFyLTu_%44<
z)MvU<O9@*`^^YjO4aSfBUu9gL^6=(qM!eu<y9fuziQhMjH>-)WERim%<e7afBGO*I
UR6OayUZ6b;p00i_>zopr0M}3_&j0`b

diff --git a/core/res/res/drawable-xhdpi/ab_stacked_solid_qntm_alpha.9.png b/core/res/res/drawable-xhdpi/ab_stacked_solid_qntm_alpha.9.png
deleted file mode 100644
index 6d8789022efc297f5c415eaca765a561f3373f1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nETBu^K|kcwMxZy9ni7;>;U{QsY*
zZFpDocwsD4TjY%>w++URe12W^4Q_iLdCqjgs#hmj8F7Q1QkN7I6#gHdH`8{fg2HY^
e`ToSqQrs3UETxlU{!a$l#^CAd=d#Wzp$PzVVJoiy

diff --git a/core/res/res/drawable-xhdpi/ab_stacked_transparent_qntm_alpha.9.png b/core/res/res/drawable-xhdpi/ab_stacked_transparent_qntm_alpha.9.png
deleted file mode 100644
index 58f3e0fac378d83f8ccaaafcf05d7184439f86db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nETSWg$nkcwMxZ*AmdP~c#26f02q
zF3)Yvo!rg&%x9mPyJPB++0)%!gN@vue=Bmp3tlO5GBG{M+S+{P++X&cH9W7wbl#d>
V)eAPzya%+1!PC{xWt~$(69A>3Emr^l

diff --git a/core/res/res/drawable-xhdpi/ab_transparent_qntm_alpha.9.png b/core/res/res/drawable-xhdpi/ab_transparent_qntm_alpha.9.png
deleted file mode 100644
index c37ba9ee25e1cf77637d2efec4e30ff4d3e93199..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nETP)`@fkcwMxZy9ni7;rEj`1AjA
zS^mMbO$CiM518`Qj90F{#KX#j4;V3O3J6U2cO$#f!J*FilU-YGHlJH+%CWGhLrOpk
O7(8A5T-G@yGywobt|OEH

diff --git a/core/res/res/drawable-xxhdpi/ab_bottom_solid_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/ab_bottom_solid_qntm_alpha.9.png
deleted file mode 100644
index 65b8d4af619460892e5e369341efbd3dde2108fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD0wlNH<oX4qn3BBRT^Rni_n+Ah<Z%{wL>4nJ
za0`PlBg3pY5<o%r5>H=O_Iu3oB9eS()~1F6g{nMV978hhy}f0~*Qy}kdeQvZ`a^&7
zPhZPDqo4EUsKwEpqN0|JLR>4>tj>R2WfZ8Io*q)YjfaOTt8{9Kzw+5T`wq`+!UuM(
zD(ruo9DjS^g0RKA)`*B)QU5FVPq_B!r{ByaZ#nZfFs?`ex`M&e)z4*}Q$iB}^Hx?(

diff --git a/core/res/res/drawable-xxhdpi/ab_bottom_transparent_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/ab_bottom_transparent_qntm_alpha.9.png
deleted file mode 100644
index a397baadf22c1c6f528745cbd34d14f065fd5d56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD0wlNH<oX4qn3BBRT^Rni_n+Ah<Z%{wL>4nJ
za0`PlBg3pY5<o%r5>H=O_Iu3oA~O8P?k;Qt3gvpbIEG~0dwXjmX9EKd%Yi*RCjQQU
z;J0zB5ckoB@1-2>m+E%S^YUA5C0@MUEZ0=)=5(nU6IXn3nDpHdKiJzQbz|BGyA|^n
kSn08{e)YW87<*90`~lZw;l=wMffh4(y85}Sb4q9e0Cd<$3jhEB

diff --git a/core/res/res/drawable-xxhdpi/ab_solid_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/ab_solid_qntm_alpha.9.png
deleted file mode 100644
index b56fa4ad1614345273b0be30e52723a12160734f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD1|(%J94Z7-Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqv%H8T+o7_z=|G_co-U3d6}R5r*~oiDLBJ*O*^__K
zOIvmxS*UAm?DRf-L)DrV50Bd$qdfK6vu2-9vs!rVa@6Yw$M_HLc4%Z`<r2{dfRGCu
zIDza14vj)!l8My|$OcQ{Q+A8x)w{zIH^EwNty`S?Y)+n?G}zSN)3+V2et+{N{{#*3
Vm~Ml)_knI@@O1TaS?83{1ORl1TIv7*

diff --git a/core/res/res/drawable-xxhdpi/ab_stacked_solid_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/ab_stacked_solid_qntm_alpha.9.png
deleted file mode 100644
index 71b9737011b085aab43a801b9ed111b13deef0cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD0wlNH<oX4qn3BBRT^Rni_n+Ah<Z%{wL>4nJ
za0`PlBg3pY5<o%r5>H=O_Iu3oB9fwRC)Vr)3T1n`IEG~0dwX>w?*RiIW`ory{;&Vm
zz<2J}UPhq>R~VVr9(@@#b<ZlR_}SNXUXuwAmz|*;xcJpZ5&YmveL$wSqhs#L7k6?s
iHCFI?UN5|_FFaF)r&j#({&PTU89ZJ6T-G@yGywpdLqWIz

diff --git a/core/res/res/drawable-xxhdpi/ab_stacked_transparent_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/ab_stacked_transparent_qntm_alpha.9.png
deleted file mode 100644
index e2cc71531b7c32ae5e615dabda263a14dcc4e5ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD0wlNH<oX4qn3BBRT^Rni_n+Ah<Z%{wL>4nJ
za0`PlBg3pY5<o%r5>H=O_Iu3oBGM)n)9<AMg|a<e978hhy}i1Tx4}Sw*+Kf^Chp(;
zN0}BbW!H4H3SSqeZhpUJ`o|Zw#Vbx)YznE$jWh@#1U?5I4hjgE9I*9DePH#Z%R%+7
erjhS{e`OPNWj(y&|8akywG5uFelF{r5}E)GI!9{&

diff --git a/core/res/res/drawable-xxhdpi/ab_transparent_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/ab_transparent_qntm_alpha.9.png
deleted file mode 100644
index 605d1de1e1070c042ca955cbd877bc39cbcc2c6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^ULefD0wlNH<oX4qn3BBRT^Rni_n+Ah<Z%{wL>4nJ
za0`PlBg3pY5<o%r5>H=O_Iu3oB9hVz3mW$Uh2lJ2978hhy}i1T_kaTjv%`<S<z=^c
zJ_u=8hEGvfcDcUyiD`MQj-_;H03q;sMFtmFmP+i@9OX#)EAi{{?|y&H&NP9o_t|;l
QN}x>)p00i_>zopr01)m!9{>OV

diff --git a/core/res/res/drawable/ab_bottom_solid_quantum.xml b/core/res/res/drawable/ab_bottom_solid_quantum.xml
deleted file mode 100644
index 848737e30cc2..000000000000
--- a/core/res/res/drawable/ab_bottom_solid_quantum.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ab_bottom_solid_qntm_alpha"
-    android:tint="?attr/colorBackground"
-    android:tintMode="multiply" />
diff --git a/core/res/res/drawable/ab_bottom_transparent_quantum.xml b/core/res/res/drawable/ab_bottom_transparent_quantum.xml
deleted file mode 100644
index 29df6b909c73..000000000000
--- a/core/res/res/drawable/ab_bottom_transparent_quantum.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ab_bottom_transparent_qntm_alpha"
-    android:tint="?attr/colorBackground"
-    android:tintMode="multiply" />
diff --git a/core/res/res/drawable/ab_solid_quantum.xml b/core/res/res/drawable/ab_solid_quantum.xml
deleted file mode 100644
index e56bb401ad4d..000000000000
--- a/core/res/res/drawable/ab_solid_quantum.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ab_solid_qntm_alpha"
-    android:tint="?attr/colorBackground"
-    android:tintMode="multiply" />
diff --git a/core/res/res/drawable/ab_stacked_solid_quantum.xml b/core/res/res/drawable/ab_stacked_solid_quantum.xml
deleted file mode 100644
index df775afa29d0..000000000000
--- a/core/res/res/drawable/ab_stacked_solid_quantum.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ab_stacked_solid_qntm_alpha"
-    android:tint="?attr/colorBackground"
-    android:tintMode="multiply" />
diff --git a/core/res/res/drawable/ab_stacked_transparent_quantum.xml b/core/res/res/drawable/ab_stacked_transparent_quantum.xml
deleted file mode 100644
index bdae6b9bc399..000000000000
--- a/core/res/res/drawable/ab_stacked_transparent_quantum.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ab_stacked_transparent_qntm_alpha"
-    android:tint="?attr/colorBackground"
-    android:tintMode="multiply" />
diff --git a/core/res/res/drawable/ab_transparent_quantum.xml b/core/res/res/drawable/ab_transparent_quantum.xml
deleted file mode 100644
index 495bfb6d59c7..000000000000
--- a/core/res/res/drawable/ab_transparent_quantum.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ab_transparent_qntm_alpha"
-    android:tint="?attr/colorControlNormal" />
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 362182e092b3..19eee5f30dcf 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -913,8 +913,14 @@
         <!-- ============= -->
         <!-- Color palette -->
         <!-- ============= -->
+        <attr name="colorPrimaryDark" format="color" />
+        <attr name="colorPrimary" format="color" />
+        <attr name="colorPrimaryLight" format="color" />
+        <attr name="colorAccent" format="color" />
+
         <attr name="colorControlNormal" format="color" />
         <attr name="colorControlActivated" format="color" />
+
         <attr name="colorButtonNormal" format="color" />
         <attr name="colorButtonPressed" format="color" />
         <attr name="colorButtonNormalColored" format="color" />
diff --git a/core/res/res/values/colors_quantum.xml b/core/res/res/values/colors_quantum.xml
index d10f7c06aae2..ebe4a495cca1 100644
--- a/core/res/res/values/colors_quantum.xml
+++ b/core/res/res/values/colors_quantum.xml
@@ -16,16 +16,14 @@
 
 <resources>
     <color name="background_quantum_dark">@color/black</color>
-    <color name="background_quantum_light">@color/quantum_grey_50</color>
-    <color name="secondary_background_quantum_dark">@color/quantum_grey_700</color>
-    <color name="secondary_background_quantum_light">@color/quantum_grey_100</color>
+    <color name="background_quantum_light">@color/white</color>
 
     <color name="bright_foreground_quantum_dark">@color/background_quantum_light</color>
     <color name="bright_foreground_quantum_light">@color/background_quantum_dark</color>
     <!-- TODO: This is 50% alpha black -->
     <color name="bright_foreground_disabled_quantum_dark">#80000000</color>
-    <!-- TODO: This is 50% alpha grey_50 -->
-    <color name="bright_foreground_disabled_quantum_light">#80fafafa</color>
+    <!-- TODO: This is 50% alpha white -->
+    <color name="bright_foreground_disabled_quantum_light">#80ffffff</color>
     <color name="bright_foreground_inverse_quantum_dark">@color/bright_foreground_quantum_light</color>
     <color name="bright_foreground_inverse_quantum_light">@color/bright_foreground_quantum_dark</color>
 
@@ -34,41 +32,13 @@
     <color name="dim_foreground_disabled_quantum_dark">#80bebebe</color>
     <color name="dim_foreground_disabled_quantum_light">#80323232</color>
 
-    <!-- TODO: These should be theme attributes. -->
-    <color name="control_normal_foreground_quantum_light">@color/secondary_text_quantum_light</color>
-    <color name="control_activated_foreground_quantum_light">@color/quantum_teal_700</color>
-
-    <!-- TODO: These should be theme attributes. -->
-    <color name="control_normal_foreground_quantum_dark">@color/secondary_text_quantum_dark</color>
-    <color name="control_activated_foreground_quantum_dark">@color/quantum_lime_A200</color>
-
-    <!-- TODO: These should be theme attributes. -->
-    <color name="btn_default_normal_quantum_light">@color/quantum_grey_300</color>
-    <color name="btn_default_pressed_quantum_light">@color/quantum_grey_500</color>
-
-    <!-- TODO: These should be theme attributes. -->
-    <color name="btn_default_normal_quantum_dark">@color/quantum_grey_700</color>
-    <color name="btn_default_pressed_quantum_dark">@color/quantum_grey_500</color>
-
     <color name="hint_foreground_quantum_dark">@color/bright_foreground_disabled_quantum_dark</color>
     <color name="hint_foreground_quantum_light">@color/bright_foreground_disabled_quantum_light</color>
-    <!-- TODO: This is 40% alpha lime_A200 -->
-    <color name="highlighted_text_quantum_dark">#66eeff41</color>
-    <!-- TODO: This is 40% alpha teal_700 -->
+    <!-- TODO: This is 40% alpha teal_A200 -->
+    <color name="highlighted_text_quantum_dark">#660097a7</color>
+    <!-- TODO: This is 40% alpha teal_A200 -->
     <color name="highlighted_text_quantum_light">#660097a7</color>
 
-    <!-- TODO: These should all be pushed into a TimePicker widget style. -->
-    <color name="timepicker_default_background_quantum_dark">@color/background_quantum_dark</color>
-    <color name="timepicker_default_background_quantum_light">@color/background_quantum_light</color>
-    <color name="timepicker_default_text_color_quantum_dark">@color/bright_foreground_quantum_dark</color>
-    <color name="timepicker_default_text_color_quantum_light">@color/bright_foreground_quantum_light</color>
-    <color name="timepicker_default_disabled_color_quantum_dark">@color/bright_foreground_disabled_quantum_dark</color>
-    <color name="timepicker_default_disabled_color_quantum_light">@color/bright_foreground_disabled_quantum_light</color>
-    <color name="timepicker_default_ampm_selected_background_color_quantum_dark">@color/control_activated_foreground_quantum_dark</color>
-    <color name="timepicker_default_ampm_selected_background_color_quantum_light">@color/control_activated_foreground_quantum_light</color>
-    <color name="timepicker_default_ampm_unselected_background_color_quantum_dark">@color/transparent</color>
-    <color name="timepicker_default_ampm_unselected_background_color_quantum_light">@color/white</color>
-
     <!-- Primary & accent colors -->
 
     <color name="quantum_red_100">#fff4c7c3</color>
@@ -155,10 +125,4 @@
     <color name="primary_text_quantum_dark">#deffffff</color>
     <color name="secondary_text_quantum_dark">#8affffff</color>
     <color name="tertiary_text_quantum_dark">#4dffffff</color>
-
-    <!-- "Theme" colors to be replaced by attrs when available -->
-    <color name="theme_color_100">@color/quantum_teal_100</color>
-    <color name="theme_color_300">@color/quantum_teal_300</color>
-    <color name="theme_color_500">@color/quantum_teal_500</color>
-    <color name="theme_color_700">@color/quantum_teal_700</color>
 </resources>
diff --git a/core/res/res/values/styles_quantum.xml b/core/res/res/values/styles_quantum.xml
index 85d8761c2d5c..dd148c441363 100644
--- a/core/res/res/values/styles_quantum.xml
+++ b/core/res/res/values/styles_quantum.xml
@@ -340,13 +340,13 @@ please see styles_device_defaults.xml.
 
     <style name="TextAppearance.Quantum.TimePicker.TimeLabel" parent="TextAppearance.Quantum">
         <item name="textSize">@dimen/timepicker_time_label_size</item>
-        <item name="textColor">@color/timepicker_default_text_color_quantum_dark</item>
+        <item name="textColor">?attr/textColorSecondary</item>
     </style>
 
     <style name="TextAppearance.Quantum.TimePicker.AmPmLabel" parent="TextAppearance.Quantum">
         <item name="textSize">@dimen/timepicker_ampm_label_size</item>
         <item name="textAllCaps">true</item>
-        <item name="textColor">@color/timepicker_default_text_color_quantum_dark</item>
+        <item name="textColor">?attr/textColorSecondary</item>
         <item name="textStyle">bold</item>
     </style>
 
@@ -377,11 +377,11 @@ please see styles_device_defaults.xml.
     <style name="TextAppearance.Quantum.Light.CalendarViewWeekDayView" parent="TextAppearance.Quantum.CalendarViewWeekDayView"/>
 
     <style name="TextAppearance.Quantum.Light.TimePicker.TimeLabel" parent="TextAppearance.Quantum.TimePicker.TimeLabel">
-        <item name="textColor">@color/timepicker_default_text_color_quantum_light</item>
+        <item name="textColor">?attr/textColorSecondary</item>
     </style>
 
     <style name="TextAppearance.Quantum.Light.TimePicker.AmPmLabel" parent="TextAppearance.Quantum.TimePicker.AmPmLabel">
-        <item name="textColor">@color/timepicker_default_text_color_quantum_light</item>
+        <item name="textColor">?attr/textColorSecondary</item>
     </style>
 
     <!-- Widget Styles -->
@@ -545,16 +545,16 @@ please see styles_device_defaults.xml.
     <style name="Widget.Quantum.TimePicker" parent="Widget.TimePicker">
         <item name="legacyLayout">@layout/time_picker_legacy_holo</item>
         <item name="internalLayout">@layout/time_picker_holo</item>
-        <item name="disabledColor">@color/timepicker_default_disabled_color_quantum_dark</item>
-        <item name="headerSelectedTextColor">@color/holo_blue_light</item>
-        <item name="headerUnselectedTextColor">@color/timepicker_default_text_color_quantum_dark</item>
-        <item name="headerBackgroundColor">@color/timepicker_default_background_quantum_dark</item>
-        <item name="numbersTextColor">@color/timepicker_default_text_color_quantum_dark</item>
-        <item name="numbersBackgroundColor">@color/timepicker_default_background_quantum_dark</item>
-        <item name="amPmTextColor">@color/timepicker_default_text_color_quantum_dark</item>
-        <item name="amPmUnselectedBackgroundColor">@color/timepicker_default_background_quantum_dark</item>
-        <item name="amPmSelectedBackgroundColor">@color/holo_blue_light</item>
-        <item name="numbersSelectorColor">@color/holo_blue_light</item>
+        <item name="disabledColor">@color/bright_foreground_disabled_quantum_dark</item>
+        <item name="headerSelectedTextColor">?attr/colorControlActivated</item>
+        <item name="headerUnselectedTextColor">?attr/textColorPrimary</item>
+        <item name="headerBackgroundColor">?attr/colorBackground</item>
+        <item name="numbersTextColor">?attr/textColorSecondary</item>
+        <item name="numbersBackgroundColor">?attr/colorControlNormal</item>
+        <item name="amPmTextColor">?attr/textColorSecondary</item>
+        <item name="amPmUnselectedBackgroundColor">?attr/colorControlNormal</item>
+        <item name="amPmSelectedBackgroundColor">?attr/colorControlActivated</item>
+        <item name="numbersSelectorColor">?attr/colorControlActivated</item>
     </style>
 
     <style name="Widget.Quantum.DatePicker" parent="Widget.DatePicker">
@@ -758,9 +758,9 @@ please see styles_device_defaults.xml.
     <style name="Widget.Quantum.ActionBar" parent="Widget.ActionBar">
         <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item>
         <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item>
-        <item name="background">@drawable/ab_transparent_quantum</item>
-        <item name="backgroundStacked">@drawable/ab_stacked_transparent_quantum</item>
-        <item name="backgroundSplit">@drawable/ab_bottom_transparent_quantum</item>
+        <item name="background">@null</item>
+        <item name="backgroundStacked">@null</item>
+        <item name="backgroundSplit">@null</item>
         <item name="divider">?attr/dividerVertical</item>
         <item name="progressBarStyle">@style/Widget.Quantum.ProgressBar.Horizontal</item>
         <item name="indeterminateProgressStyle">@style/Widget.Quantum.ProgressBar</item>
@@ -769,16 +769,9 @@ please see styles_device_defaults.xml.
     </style>
 
     <style name="Widget.Quantum.ActionBar.Solid">
-        <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item>
-        <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item>
-        <item name="background">@drawable/ab_solid_quantum</item>
-        <item name="backgroundStacked">@drawable/ab_stacked_solid_quantum</item>
-        <item name="backgroundSplit">@drawable/ab_bottom_solid_quantum</item>
-        <item name="divider">?attr/dividerVertical</item>
-        <item name="progressBarStyle">@style/Widget.Quantum.ProgressBar.Horizontal</item>
-        <item name="indeterminateProgressStyle">@style/Widget.Quantum.ProgressBar</item>
-        <item name="progressBarPadding">32dip</item>
-        <item name="itemPadding">8dip</item>
+        <item name="background">?attr/colorPrimary</item>
+        <item name="backgroundStacked">?attr/colorPrimary</item>
+        <item name="backgroundSplit">?attr/colorPrimary</item>
     </style>
 
     <style name="Widget.Quantum.ActionMode" parent="Widget.ActionMode">
@@ -869,19 +862,10 @@ please see styles_device_defaults.xml.
 
     <style name="Widget.Quantum.Light.NumberPicker" parent="Widget.Quantum.NumberPicker"/>
 
-    <style name="Widget.Quantum.Light.TimePicker" parent="Widget.TimePicker">
+    <style name="Widget.Quantum.Light.TimePicker" parent="Widget.Quantum.TimePicker">
         <item name="legacyLayout">@layout/time_picker_legacy_holo</item>
         <item name="internalLayout">@layout/time_picker_holo</item>
-        <item name="disabledColor">@color/timepicker_default_disabled_color_quantum_light</item>
-        <item name="headerSelectedTextColor">@color/holo_blue_light</item>
-        <item name="headerUnselectedTextColor">@color/timepicker_default_text_color_quantum_light</item>
-        <item name="headerBackgroundColor">@color/timepicker_default_background_quantum_light</item>
-        <item name="numbersTextColor">@color/timepicker_default_text_color_quantum_light</item>
-        <item name="numbersBackgroundColor">@color/timepicker_default_background_quantum_light</item>
-        <item name="amPmTextColor">@color/timepicker_default_text_color_quantum_light</item>
-        <item name="amPmUnselectedBackgroundColor">@color/timepicker_default_background_quantum_light</item>
-        <item name="amPmSelectedBackgroundColor">@color/holo_blue_light</item>
-        <item name="numbersSelectorColor">@color/holo_blue_light</item>
+        <item name="disabledColor">@color/bright_foreground_disabled_quantum_light</item>
     </style>
 
     <style name="Widget.Quantum.Light.DatePicker" parent="Widget.Quantum.DatePicker"/>
@@ -985,25 +969,18 @@ please see styles_device_defaults.xml.
     <style name="Widget.Quantum.Light.ActionBar" parent="Widget.Quantum.ActionBar">
         <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item>
         <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item>
-        <item name="background">@drawable/ab_transparent_quantum</item>
-        <item name="backgroundStacked">@drawable/ab_stacked_transparent_quantum</item>
-        <item name="backgroundSplit">@drawable/ab_bottom_transparent_quantum</item>
+        <item name="background">@null</item>
+        <item name="backgroundStacked">@null</item>
+        <item name="backgroundSplit">@null</item>
         <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum</item>
         <item name="progressBarStyle">@style/Widget.Quantum.Light.ProgressBar.Horizontal</item>
         <item name="indeterminateProgressStyle">@style/Widget.Quantum.Light.ProgressBar</item>
     </style>
 
     <style name="Widget.Quantum.Light.ActionBar.Solid">
-        <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item>
-        <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item>
-        <item name="background">@drawable/ab_solid_quantum</item>
-        <item name="backgroundStacked">@drawable/ab_stacked_solid_quantum</item>
-        <item name="backgroundSplit">@drawable/ab_bottom_solid_quantum</item>
-        <item name="divider">?attr/dividerVertical</item>
-        <item name="progressBarStyle">@style/Widget.Quantum.Light.ProgressBar.Horizontal</item>
-        <item name="indeterminateProgressStyle">@style/Widget.Quantum.Light.ProgressBar</item>
-        <item name="progressBarPadding">32dip</item>
-        <item name="itemPadding">8dip</item>
+        <item name="background">?attr/colorPrimary</item>
+        <item name="backgroundStacked">?attr/colorPrimary</item>
+        <item name="backgroundSplit">?attr/colorPrimary</item>
     </style>
 
     <style name="Widget.Quantum.Light.CompoundButton.Switch" parent="Widget.Quantum.CompoundButton.Switch">
diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml
index 50f1ca68c8f1..2ac6a07a0af9 100644
--- a/core/res/res/values/themes_quantum.xml
+++ b/core/res/res/values/themes_quantum.xml
@@ -288,8 +288,8 @@ please see themes_device_defaults.xml.
         <item name="actionDropDownStyle">@style/Widget.Quantum.Spinner.DropDown.ActionBar</item>
         <item name="actionButtonStyle">@style/Widget.Quantum.ActionButton</item>
         <item name="actionOverflowButtonStyle">@style/Widget.Quantum.ActionButton.Overflow</item>
-        <item name="actionModeBackground">@color/theme_color_700</item>
-        <item name="actionModeSplitBackground">@color/theme_color_700</item>
+        <item name="actionModeBackground">?attr/colorPrimaryDark</item>
+        <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item>
         <item name="actionModeCloseDrawable">@drawable/ic_cab_done_quantum</item>
         <item name="actionBarTabStyle">@style/Widget.Quantum.ActionBar.TabView</item>
         <item name="actionBarTabBarStyle">@style/Widget.Quantum.ActionBar.TabBar</item>
@@ -334,7 +334,7 @@ please see themes_device_defaults.xml.
         <item name="timePickerStyle">@style/Widget.Quantum.TimePicker</item>
 
         <!-- TimePicker background color -->
-        <item name="timePickerHeaderBackgroundColor">@color/timepicker_default_background_quantum_dark</item>
+        <item name="timePickerHeaderBackgroundColor">?colorBackground</item>
 
         <!-- TimePicker Header time label text appearance -->
         <item name="timePickerHeaderTimeLabelTextAppearance">@style/TextAppearance.Quantum.TimePicker.TimeLabel</item>
@@ -356,13 +356,18 @@ please see themes_device_defaults.xml.
         <item name="fastScrollOverlayPosition">atThumb</item>
 
         <!-- Color palette -->
-        <item name="colorControlNormal">@color/control_normal_foreground_quantum_dark</item>
-        <item name="colorControlActivated">@color/control_activated_foreground_quantum_dark</item>
-        <item name="colorButtonNormal">@color/btn_default_normal_quantum_dark</item>
-        <item name="colorButtonPressed">@color/btn_default_pressed_quantum_dark</item>
+        <item name="colorPrimaryDark">@color/quantum_grey_700</item>
+        <item name="colorPrimary">@color/quantum_grey_500</item>
+        <item name="colorPrimaryLight">@color/quantum_grey_100</item>
+        <item name="colorAccent">@color/quantum_teal_A200</item>
+
+        <item name="colorControlNormal">?attr/textColorSecondary</item>
+        <item name="colorControlActivated">?attr/colorPrimaryDark</item>
+        <item name="colorButtonNormal">@color/quantum_grey_700</item>
+        <item name="colorButtonPressed">@color/quantum_grey_500</item>
         <!-- TODO: Remove these attrs and move into button style. -->
-        <item name="colorButtonNormalColored">@color/theme_color_500</item>
-        <item name="colorButtonPressedColored">@color/theme_color_300</item>
+        <item name="colorButtonNormalColored">?attr/colorPrimary</item>
+        <item name="colorButtonPressedColored">?attr/colorPrimaryDark</item>
     </style>
 
     <!-- Quantum Paper theme (light version). -->
@@ -660,7 +665,7 @@ please see themes_device_defaults.xml.
         <item name="timePickerStyle">@style/Widget.Quantum.Light.TimePicker</item>
 
         <!-- TimePicker Header background color -->
-        <item name="timePickerHeaderBackgroundColor">@color/timepicker_default_background_quantum_light</item>
+        <item name="timePickerHeaderBackgroundColor">?attr/colorBackground</item>
 
         <!-- TimePicker Header time label text appearance -->
         <item name="timePickerHeaderTimeLabelTextAppearance">@style/TextAppearance.Quantum.Light.TimePicker.TimeLabel</item>
@@ -681,13 +686,18 @@ please see themes_device_defaults.xml.
         <item name="fastScrollOverlayPosition">atThumb</item>
 
         <!-- Color palette -->
-        <item name="colorControlNormal">@color/control_normal_foreground_quantum_light</item>
-        <item name="colorControlActivated">@color/control_activated_foreground_quantum_light</item>
-        <item name="colorButtonNormal">@color/btn_default_normal_quantum_light</item>
-        <item name="colorButtonPressed">@color/btn_default_pressed_quantum_light</item>
+        <item name="colorPrimaryDark">@color/quantum_grey_700</item>
+        <item name="colorPrimary">@color/quantum_grey_500</item>
+        <item name="colorPrimaryLight">@color/quantum_grey_100</item>
+        <item name="colorAccent">@color/quantum_teal_A200</item>
+
+        <item name="colorControlNormal">?attr/textColorSecondary</item>
+        <item name="colorControlActivated">?attr/colorPrimaryLight</item>
+        <item name="colorButtonNormal">@color/quantum_grey_100</item>
+        <item name="colorButtonPressed">@color/quantum_grey_500</item>
         <!-- TODO: Remove these attrs and move into button style. -->
-        <item name="colorButtonNormalColored">@color/theme_color_500</item>
-        <item name="colorButtonPressedColored">@color/theme_color_700</item>
+        <item name="colorButtonNormalColored">?attr/colorPrimary</item>
+        <item name="colorButtonPressedColored">?attr/colorPrimaryLight</item>
     </style>
 
     <!-- Variant of the quantum (light) theme that has a solid (opaque) action bar
-- 
2.11.0