From da42a9c2b50291b368ee2e9926aac1659066101b Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 7 Aug 2014 15:57:57 -0700 Subject: [PATCH] Update cab_background assets for Material BUG: 16491778 Change-Id: I1bef337db42668b3b0c4ca4f8700c50025dfaa1f --- .../cab_background_bottom_mtrl_alpha.9.png | Bin 0 -> 126 bytes .../cab_background_top_mtrl_alpha.9.png | Bin 0 -> 119 bytes .../cab_background_bottom_mtrl_alpha.9.png | Bin 0 -> 107 bytes .../cab_background_top_mtrl_alpha.9.png | Bin 0 -> 107 bytes .../cab_background_bottom_mtrl_alpha.9.png | Bin 0 -> 140 bytes .../cab_background_top_mtrl_alpha.9.png | Bin 0 -> 136 bytes .../cab_background_bottom_mtrl_alpha.9.png | Bin 0 -> 190 bytes .../cab_background_top_mtrl_alpha.9.png | Bin 0 -> 182 bytes .../cab_background_bottom_material.xml | 29 ++++++++++++++++++ .../drawable/cab_background_top_material.xml | 29 ++++++++++++++++++ core/res/res/values/themes_material.xml | 22 +++++-------- 11 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 core/res/res/drawable-hdpi/cab_background_bottom_mtrl_alpha.9.png create mode 100644 core/res/res/drawable-hdpi/cab_background_top_mtrl_alpha.9.png create mode 100644 core/res/res/drawable-mdpi/cab_background_bottom_mtrl_alpha.9.png create mode 100644 core/res/res/drawable-mdpi/cab_background_top_mtrl_alpha.9.png create mode 100644 core/res/res/drawable-xhdpi/cab_background_bottom_mtrl_alpha.9.png create mode 100644 core/res/res/drawable-xhdpi/cab_background_top_mtrl_alpha.9.png create mode 100644 core/res/res/drawable-xxhdpi/cab_background_bottom_mtrl_alpha.9.png create mode 100644 core/res/res/drawable-xxhdpi/cab_background_top_mtrl_alpha.9.png create mode 100644 core/res/res/drawable/cab_background_bottom_material.xml create mode 100644 core/res/res/drawable/cab_background_top_material.xml diff --git a/core/res/res/drawable-hdpi/cab_background_bottom_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/cab_background_bottom_mtrl_alpha.9.png new file mode 100644 index 0000000000000000000000000000000000000000..92613b7f71bc935c81f0ea825e8b505cc0207aa9 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^STs>VJLn>~)yoo_r9q6eS)p<9&g2A?Or~8YVs_j4n O89ZJ6T-G@yGywqQJt(gL literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/cab_background_top_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/cab_background_top_mtrl_alpha.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e51ef280dd28acf3b907c4765f6de88a57dbdafd GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^S>^xl@Ln>~)y`;#+U?9MJ@b~}a z!PUD$rWkO4R5tp&ZB3|{0UFrg9dTfm-86poFvi);0>5{7EYM|L1~iGm)78&qol`;+ E09%?OrvLx| literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/cab_background_bottom_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/cab_background_bottom_mtrl_alpha.9.png new file mode 100644 index 0000000000000000000000000000000000000000..df292a0c605bbf25620a4c454af914c8ddf6c570 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%MxHK?Ar-fh6BPLWv?pycy(Dz` zx>8hgV7HsD)YgnEi@*#MvA^teB92xH5p7ymbG?pRm&WjV6XU+5jUu0&lC_4Sk1~*#MxQD!t%eK+6&)D?&(0| O89ZJ6T-G@yGywp=Yaw6& literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xhdpi/cab_background_top_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/cab_background_top_mtrl_alpha.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ed8d341147da041da0fec5c04b0bf82edcd6541b GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-e@_?3kcwMxFK^^!aNuBa_#Q9y zTYt;uA2OWGGMu62Cxa#1m>BVaoeeB3N8H0a>@+wyPBdg}PgQ;C_PCu1Xf%VTtDnm{ Hr-UW|jd~tC literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xxhdpi/cab_background_bottom_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/cab_background_bottom_mtrl_alpha.9.png new file mode 100644 index 0000000000000000000000000000000000000000..22bd8ce8cbe913a8d5f40c2281bca185e481541b GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^ULefD1|(%J94Z7-t)4E9Ar-gY-cjUYaNuBY{Qp1m zZBvA6+QGUrqLT&9PbZ$UJF~@~iIGc0BY=OwmV8zwRuFRm3z&3h6aumx8ktnVBrDex yARDXzyE4`;F|hhgavUH-9R9Wz&C0dB9cKK>^K!?PPs@Q0V(@hJb6Mw<&;$T_>^RB* literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xxhdpi/cab_background_top_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/cab_background_top_mtrl_alpha.9.png new file mode 100644 index 0000000000000000000000000000000000000000..1dd64b9ad48fcaf08e7e11170b5f0195b903b891 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^ULefD1|(%J94Z7-wVp1HAr-gYUOC9gz`((5_&q*K zU0}ac@dZ|;h_9RDmOZx=(g;}K(8#0;CRw?r0NJcuA{r1fU;zt|4U)pItTJE=P~X#; j&8M2Otl1%2S`~O7>~X)^XkMWYbO?i|tDnm{r-UW|75Fmx literal 0 HcmV?d00001 diff --git a/core/res/res/drawable/cab_background_bottom_material.xml b/core/res/res/drawable/cab_background_bottom_material.xml new file mode 100644 index 0000000000000..cfbc8543818dc --- /dev/null +++ b/core/res/res/drawable/cab_background_bottom_material.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + diff --git a/core/res/res/drawable/cab_background_top_material.xml b/core/res/res/drawable/cab_background_top_material.xml new file mode 100644 index 0000000000000..09f7a61611dd9 --- /dev/null +++ b/core/res/res/drawable/cab_background_top_material.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index e7001c358e1f0..6ee9a03f5fc58 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -304,8 +304,8 @@ please see themes_device_defaults.xml. @style/Widget.Material.ActionButton @style/Widget.Material.ActionButton.Overflow @style/Widget.Material.PopupMenu.Overflow - ?attr/colorPrimaryDark - ?attr/colorPrimaryDark + @drawable/cab_background_top_material + @drawable/cab_background_bottom_material @drawable/ic_cab_done_material @style/Widget.Material.ActionBar.TabView @style/Widget.Material.ActionBar.TabBar @@ -650,9 +650,8 @@ please see themes_device_defaults.xml. @style/Widget.Material.Light.ActionButton @style/Widget.Material.Light.ActionButton.Overflow @style/Widget.Material.Light.PopupMenu.Overflow - @null - @drawable/cab_background_top_holo_light - @drawable/cab_background_bottom_holo_light + @drawable/cab_background_top_material + @drawable/cab_background_bottom_material @drawable/ic_cab_done_material @style/Widget.Material.Light.ActionBar.TabView @style/Widget.Material.Light.ActionBar.TabBar @@ -663,6 +662,7 @@ please see themes_device_defaults.xml. @dimen/action_bar_default_height_material @style/Widget.Material.Light.PopupWindow.ActionMode @null + @null @style/ThemeOverlay.Material.ActionBar ?attr/selectableItemBackgroundBorderless @@ -960,16 +960,8 @@ please see themes_device_defaults.xml. - - - - +