From b09ee939e79960fb16d58fddcdeb658b44fe8758 Mon Sep 17 00:00:00 2001
From: Joey Rizzoli <joey@cyanogenmoditalia.it>
Date: Wed, 1 Jun 2016 15:08:07 +0200
Subject: Gallery2: Update theme

* Expose icons colors too

Change-Id: If2a7cac0779e20f39fdb3037df9d48581106ef3e
Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it>
---
 res/drawable/addspot.xml                           |  2 +-
 res/drawable/albums.xml                            |  2 +-
 res/drawable/back.xml                              |  2 +-
 res/drawable/beautify.xml                          |  2 +-
 res/drawable/bg_vidcontrol.xml                     |  2 +-
 res/drawable/camera.xml                            |  4 +-
 res/drawable/cancel.xml                            |  2 +-
 res/drawable/cancel2.xml                           |  2 +-
 res/drawable/color.xml                             |  2 +-
 res/drawable/comparison_after.xml                  |  4 +-
 res/drawable/comparison_before.xml                 |  4 +-
 res/drawable/crop.xml                              |  2 +-
 res/drawable/delete.xml                            |  2 +-
 res/drawable/done.xml                              |  2 +-
 res/drawable/done2.xml                             |  2 +-
 res/drawable/drawer.xml                            |  2 +-
 .../dropdown_ic_arrow_normal_holo_dark.xml         |  2 +-
 res/drawable/dualcamera.xml                        | 10 ++--
 res/drawable/edit.xml                              |  2 +-
 res/drawable/exposure.xml                          |  2 +-
 res/drawable/filtershow_color_picker_circle.xml    |  2 +-
 res/drawable/frames.xml                            |  6 +--
 res/drawable/hazebuster.xml                        | 10 ++--
 res/drawable/ic_media_bigscreen.xml                |  2 +-
 res/drawable/ic_media_cropscreen.xml               |  2 +-
 res/drawable/ic_media_fullscreen.xml               |  2 +-
 res/drawable/ic_vidcontrol_pause.xml               |  2 +-
 res/drawable/ic_vidcontrol_play.xml                |  2 +-
 res/drawable/more.xml                              |  2 +-
 res/drawable/more2.xml                             |  2 +-
 res/drawable/multiselect.xml                       |  2 +-
 res/drawable/multiselect_delete.xml                |  2 +-
 res/drawable/multiselect_more.xml                  |  2 +-
 res/drawable/multiselect_share.xml                 |  2 +-
 res/drawable/multiselected_back.xml                |  2 +-
 res/drawable/overflow.xml                          |  2 +-
 res/drawable/seestraight.xml                       | 16 +++---
 res/drawable/share.xml                             |  2 +-
 res/drawable/sliderbg.xml                          |  2 +-
 res/drawable/slideshow.xml                         |  2 +-
 res/drawable/spinner_triangle.xml                  |  2 +-
 res/drawable/timeline.xml                          |  4 +-
 res/drawable/truescanner.xml                       | 12 ++---
 res/drawable/videos.xml                            |  2 +-
 res/layout-land/on_screen_hint.xml                 |  2 +-
 res/layout-port/on_screen_hint.xml                 |  2 +-
 res/layout/action_mode.xml                         |  2 +-
 res/layout/camera_filmstrip.xml                    |  4 +-
 res/layout/drawer_list_item.xml                    |  2 +-
 res/layout/filtershow_actionbar.xml                |  4 +-
 res/layout/filtershow_actionbar_effects.xml        |  2 +-
 res/layout/filtershow_editor_panel.xml             |  4 +-
 res/layout/gallery_main.xml                        |  4 +-
 res/layout/photopage_progress_bar.xml              |  6 +--
 res/layout/popup_list_item.xml                     |  2 +-
 res/layout/toolbar.xml                             | 11 ++--
 res/values-land/styles.xml                         |  2 +-
 res/values/bool.xml                                |  1 +
 res/values/cm_colors.xml                           | 32 ++++++++++++
 res/values/colors.xml                              | 60 +++++++++++-----------
 res/values/filtershow_color.xml                    | 20 ++++----
 res/values/styles.xml                              | 25 +++++----
 .../android/gallery3d/app/GalleryActionBar.java    |  3 +-
 src/com/android/gallery3d/ui/PopupList.java        |  3 +-
 64 files changed, 186 insertions(+), 145 deletions(-)
 create mode 100644 res/values/cm_colors.xml

diff --git a/res/drawable/addspot.xml b/res/drawable/addspot.xml
index 15bfee87d..5e3064e5e 100644
--- a/res/drawable/addspot.xml
+++ b/res/drawable/addspot.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M19.316,16.303v-4.351h-1.66v4.351h-4.264v1.707h4.264v4.328h1.66V18.01h4.27v-1.707H19.316zM7.814,1.638c-4.087,0 -7.4,3.313 -7.4,7.401c0,4.088 3.313,7.4 7.4,7.4s7.4,-3.313 7.4,-7.4C15.215,4.952 11.901,1.638 7.814,1.638zM7.729,15.008c-3.353,0 -6.07,-2.718 -6.07,-6.071s2.718,-6.071 6.07,-6.071c3.354,0 6.071,2.718 6.071,6.071S11.083,15.008 7.729,15.008zM7.729,4.513c-2.47,0 -4.472,2.002 -4.472,4.472s2.002,4.472 4.472,4.472s4.472,-2.002 4.472,-4.472S10.199,4.513 7.729,4.513z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/albums.xml b/res/drawable/albums.xml
index 7d742d61d..23630a579 100644
--- a/res/drawable/albums.xml
+++ b/res/drawable/albums.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/back.xml b/res/drawable/back.xml
index a8e282f93..051e5b9c9 100644
--- a/res/drawable/back.xml
+++ b/res/drawable/back.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/beautify.xml b/res/drawable/beautify.xml
index 7ae64a316..6962bc649 100644
--- a/res/drawable/beautify.xml
+++ b/res/drawable/beautify.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M26.305,8.769c-0.433,0.9 -0.486,2.1 -0.486,2.1s-0.175,-1.205 -0.619,-2.128c-0.395,-0.822 -1.93,-1.111 -1.93,-1.111s1.492,-0.138 1.879,-0.938c0.451,-0.939 0.623,-2.139 0.623,-2.139s0.107,1.136 0.571,2.103c0.366,0.758 1.854,0.98 1.854,0.98S26.714,7.919 26.305,8.769zM24.283,18.035c0,0 0.081,-1.424 -0.418,-3.219c-1.354,-4.873 -3.568,-6.139 -3.568,-6.139s2.77,0.869 4.727,5.355C26.087,16.468 24.283,18.035 24.283,18.035zM23.139,17.76c0,0 0.488,1.772 -0.889,4.784c-1.379,3.017 -4.73,4.065 -4.73,4.065s2.842,-1.843 4.154,-4.443C22.706,20.119 23.139,17.76 23.139,17.76zM14.925,13.241c-2.487,1.971 -3.536,4.087 -3.536,7.08c0,3.931 5.176,7.127 5.176,7.127s-6.6,-2.607 -6.6,-7.426c0,-2.614 0.661,-5.133 1.835,-7.062c-0.72,0.654 -1.383,1.438 -1.868,2.416c-1.315,2.659 -0.804,6.175 -0.804,6.175c-2.54,-2.602 -3.533,-6.776 -2.229,-10.197c1.196,-3.136 3.49,-5.457 5.399,-6.058c3.968,-1.25 4.969,0.568 4.969,0.568s0.031,0.09 0.07,0.244c0.045,-0.37 -0.014,-0.573 -0.014,-0.573S21.336,8.16 14.925,13.241zM5.774,23.086c-0.294,0.622 -0.372,1.321 -0.372,1.321s-0.078,-0.701 -0.381,-1.34c-0.269,-0.566 -1.251,-0.704 -1.251,-0.704s0.954,-0.158 1.216,-0.711c0.307,-0.649 0.424,-1.481 0.424,-1.481s0.073,0.789 0.39,1.456C6.049,22.152 7,22.351 7,22.351S6.053,22.501 5.774,23.086zM24.859,22.814c0.478,-1.109 0.659,-2.631 0.659,-2.631s0.112,1.447 0.605,2.59c0.384,0.895 2.104,0.973 2.104,0.973s-1.716,0.152 -2.145,1.155c-0.459,1.063 -0.622,2.521 -0.622,2.521s-0.08,-1.464 -0.549,-2.553c-0.418,-0.972 -2.063,-1.146 -2.063,-1.146l-0.028,-0.004C22.822,23.72 24.451,23.762 24.859,22.814z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/bg_vidcontrol.xml b/res/drawable/bg_vidcontrol.xml
index fcfacf183..9ce9f6ad0 100644
--- a/res/drawable/bg_vidcontrol.xml
+++ b/res/drawable/bg_vidcontrol.xml
@@ -34,7 +34,7 @@
     android:viewportHeight="48.0"
     android:viewportWidth="48.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:fillAlpha="0.5"
         android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
 </vector>
diff --git a/res/drawable/camera.xml b/res/drawable/camera.xml
index 300b4a903..6249f8968 100644
--- a/res/drawable/camera.xml
+++ b/res/drawable/camera.xml
@@ -37,10 +37,10 @@
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 12 9.799 C 13.7673111995 9.799 15.2 11.2316888005 15.2 12.999 C 15.2 14.7663111995 13.7673111995 16.199 12 16.199 C 10.2326888005 16.199 8.8 14.7663111995 8.8 12.999 C 8.8 11.2316888005 10.2326888005 9.799 12 9.799 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M9,3L7.17,5H4c-1.1,0-2,0.9-2,2v12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V7c0-1.1-0.9-2-2-2h-3.17L15,3H9z
 M12,18c-2.76,0-5-2.24-5-5c0-2.76,2.24-5,5-5s5,2.24,5,5C17,15.76,14.76,18,12,18z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml
index c3e5231e7..335e60930 100644
--- a/res/drawable/cancel.xml
+++ b/res/drawable/cancel.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/cancel2.xml b/res/drawable/cancel2.xml
index 4ccde0a39..82eaec1ed 100644
--- a/res/drawable/cancel2.xml
+++ b/res/drawable/cancel2.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/color.xml b/res/drawable/color.xml
index 8a5530857..d2dc37e26 100644
--- a/res/drawable/color.xml
+++ b/res/drawable/color.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M16,4.951C9.898,4.951 4.951,9.898 4.951,16c0,6.102 4.947,11.049 11.049,11.049c1.02,0 1.842,-0.822 1.842,-1.842c0,-0.479 -0.178,-0.908 -0.479,-1.232c-0.289,-0.326 -0.461,-0.75 -0.461,-1.223c0,-1.02 0.822,-1.842 1.842,-1.842h2.166c3.389,0 6.139,-2.75 6.139,-6.138C27.049,9.347 22.102,4.951 16,4.951zM9.248,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C11.09,15.178 10.268,16 9.248,16zM12.932,11.09c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.842 1.842,-1.842c1.018,0 1.84,0.823 1.84,1.842C14.771,10.268 13.949,11.09 12.932,11.09zM19.068,11.09c-1.021,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.821,-1.842 1.842,-1.842c1.02,0 1.842,0.823 1.842,1.842C20.91,10.268 20.088,11.09 19.068,11.09zM22.752,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C24.594,15.178 23.771,16 22.752,16z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/comparison_after.xml b/res/drawable/comparison_after.xml
index 972f69d61..262aa4155 100644
--- a/res/drawable/comparison_after.xml
+++ b/res/drawable/comparison_after.xml
@@ -33,10 +33,10 @@
         android:viewportWidth="36.0"
         android:viewportHeight="36.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M18,1c9.389,0 17,7.611 17,17c0,9.388 -7.611,17 -17,17C8.612,35 1,27.388 1,18C1,8.611 8.612,1 18,1z"
         android:fillAlpha="0.26"/>
     <path
         android:pathData="M9.258,16h1.333v-1.333H9.258V16zM9.258,18.667h1.333v-1.334H9.258V18.667zM9.258,21.333h1.333V20H9.258V21.333zM10.591,23.999v-1.333H9.258C9.258,23.402 9.854,23.999 10.591,23.999zM9.258,13.334h1.333v-1.333C9.854,12.001 9.258,12.598 9.258,13.334zM17.334,25.332h1.333V10.667h-1.333V25.332zM14.667,23.999H16v-1.333h-1.333V23.999zM25.408,12.001h-5.37v1.333h5.37v9.332h-5.37v1.333h5.37c0.737,0 1.334,-0.597 1.334,-1.333v-9.332C26.742,12.598 26.146,12.001 25.408,12.001zM15.97,12.001h-1.333v1.333h1.333V12.001zM11.955,13.334h1.334v-1.333h-1.334V13.334zM11.955,23.999h1.334v-1.333h-1.334V23.999z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/comparison_before.xml b/res/drawable/comparison_before.xml
index 9dd01fc9f..5066cd987 100644
--- a/res/drawable/comparison_before.xml
+++ b/res/drawable/comparison_before.xml
@@ -35,8 +35,8 @@
     <path
         android:pathData="M18,1c9.389,0 17,7.611 17,17c0,9.388 -7.611,17 -17,17C8.612,35 1,27.388 1,18C1,8.611 8.612,1 18,1z"
         android:fillAlpha="0.50"
-        android:fillColor="#000000"/>
+        android:fillColor="@color/black"/>
     <path
         android:pathData="M9.258,16h1.333v-1.333H9.258V16zM10.591,23.999v-1.333H9.258C9.258,23.402 9.854,23.999 10.591,23.999zM9.258,13.334h1.333v-1.333C9.854,12.001 9.258,12.598 9.258,13.334zM9.258,21.333h1.333V20H9.258V21.333zM9.258,18.667h1.333v-1.334H9.258V18.667zM14.667,23.999H16v-1.333h-1.333V23.999zM25.408,12.001h-5.37v1.333h5.37v9.332h-5.37v1.333h5.37c0.737,0 1.334,-0.597 1.334,-1.333v-9.332C26.742,12.598 26.146,12.001 25.408,12.001zM17.334,25.332h1.333V10.667h-1.333V25.332zM15.97,12.001h-1.333v1.333h1.333V12.001zM11.955,13.334h1.334v-1.333h-1.334V13.334zM11.955,23.999h1.334v-1.333h-1.334V23.999z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/crop.xml b/res/drawable/crop.xml
index 9621a7d86..25ff64968 100644
--- a/res/drawable/crop.xml
+++ b/res/drawable/crop.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M20.911,19.324h2.28v-8.26c0,-1.127 -0.945,-2.438 -2.073,-2.438h-8.262v2.312h8.055V19.324zM11.117,21.008v-16.4H8.809v4.019h-4.02l-0.031,2.315l4.051,-0.004V21.27c0,1.127 0.914,2.041 2.041,2.041h10.03v4.082h2.312v-4.082h4.052v-2.303H11.117z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/delete.xml b/res/drawable/delete.xml
index e3afef66d..1285cb916 100644
--- a/res/drawable/delete.xml
+++ b/res/drawable/delete.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M5.999,19.001c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2v-12h-12V19.001zM18.999,4.001h-3.5l-1,-1h-5l-1,1h-3.5v2h14V4.001z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/done.xml b/res/drawable/done.xml
index bfd631671..439357c61 100644
--- a/res/drawable/done.xml
+++ b/res/drawable/done.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/done2.xml b/res/drawable/done2.xml
index 198cbf316..76d5f561b 100644
--- a/res/drawable/done2.xml
+++ b/res/drawable/done2.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/drawer.xml b/res/drawable/drawer.xml
index eaebbc471..e0a8061c8 100644
--- a/res/drawable/drawer.xml
+++ b/res/drawable/drawer.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M2.989,18h18.022v-2H2.989V18zM2.989,13h18.022v-2H2.989V13zM2.989,6v2h18.022V6H2.989z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
index 6f9216205..49788bf9b 100644
--- a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
+++ b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
@@ -35,6 +35,6 @@
     android:viewportWidth="24.0">
     <path
         android:fillAlpha="0.54"
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M0,5h24l-12,14L0,5z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/dualcamera.xml b/res/drawable/dualcamera.xml
index 7f05fa9ff..7bfdc46be 100644
--- a/res/drawable/dualcamera.xml
+++ b/res/drawable/dualcamera.xml
@@ -5,17 +5,17 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.794,10.447H12.36c-1.152,0 -2.165,0.887 -2.165,2.04v7.912c0,1.153 1.012,2.086 2.165,2.086h7.434c1.154,0 2.011,-0.933 2.011,-2.086v-7.912C21.805,11.334 20.948,10.447 19.794,10.447zM19.865,20.57h-7.692v-8.175h7.692V20.57z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
     <path
         android:pathData="M21,7h4v5h2V7.713C27,6.341 26.156,5 24.783,5H21V7z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
     <path
         android:pathData="M7,12V7h4V5H7.399C6.027,5 5,6.341 5,7.713V12H7z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
     <path
         android:pathData="M11,26H7v-5H5v4.098C5,26.471 6.027,28 7.399,28H11V26z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
     <path
         android:pathData="M25,21v5h-4v2h3.783C26.156,28 27,26.471 27,25.098V21H25z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/edit.xml b/res/drawable/edit.xml
index 150152479..b28d23ef2 100644
--- a/res/drawable/edit.xml
+++ b/res/drawable/edit.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M2.999,17.252v3.75h3.75l11.061,-11.06l-3.75,-3.75L2.999,17.252zM20.708,7.042c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.021,-0.39 -1.41,0l-1.83,1.83l3.75,3.75L20.708,7.042z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml
index 493e67233..ad0a64f4f 100644
--- a/res/drawable/exposure.xml
+++ b/res/drawable/exposure.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.514,21.201v2.357h1.644l0.045,-2.357h2.313v-1.688h-2.357V17.2h-1.643v2.313h-2.357v1.688H19.514zM24.85,4.793H7.061c-1.228,0 -2.223,0.995 -2.223,2.224v17.788c0,1.229 0.995,2.402 2.223,2.402H24.85c1.229,0 2.313,-1.174 2.313,-2.402V7.017C27.161,5.789 26.077,4.793 24.85,4.793zM8.173,8.173h6.671v2H8.173V8.173zM25.161,25.162h-18.1l18.1,-18.541V25.162z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/filtershow_color_picker_circle.xml b/res/drawable/filtershow_color_picker_circle.xml
index 433df4800..1457a68eb 100644
--- a/res/drawable/filtershow_color_picker_circle.xml
+++ b/res/drawable/filtershow_color_picker_circle.xml
@@ -21,6 +21,6 @@
         android:radius="0dp" />
     <solid android:color="@color/red"/>
     <stroke android:width="0dp"
-            android:color="#ff000000"/>
+            android:color="@color/black"/>
 </shape>
 
diff --git a/res/drawable/frames.xml b/res/drawable/frames.xml
index b26f282fb..f668e4dce 100644
--- a/res/drawable/frames.xml
+++ b/res/drawable/frames.xml
@@ -34,11 +34,11 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M24.934,8.228h-4.467L16,3.761l-4.468,4.467H7.065c-1.234,0 -2.233,1 -2.233,2.233v15.441c0,1.232 0.999,2.338 2.233,2.338h17.869c1.233,0 2.233,-1.104 2.233,-2.338V10.461C27.168,9.228 26.168,8.228 24.934,8.228zM25.178,26.25H6.822V10.252h5.285l3.932,-3.699l3.886,3.699h5.253V26.25z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
     <path
         android:pathData="M23.143,12.216"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
     <path
         android:pathData="M8.923,12.216h14.153v11.966h-14.153z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/hazebuster.xml b/res/drawable/hazebuster.xml
index bc2bb74dd..0b157ac8a 100644
--- a/res/drawable/hazebuster.xml
+++ b/res/drawable/hazebuster.xml
@@ -34,26 +34,26 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M29,20.9c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.7,0.4-1.7,0.4-2.3-0.1c-0.2-0.1-0.5-0.3-0.7-0.3
 c-0.2,0.3-0.5,0.5-0.8,0.7c0.4,0,0.8,0.1,1.1,0.3c0.9,0.6,2.3,0.7,3.2,0.1l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2
 C29.3,21.3,29.2,21,29,20.9z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M29,16.2c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.4,0.2-0.9,0.3-1.4,0.3c0,0,0,0,0,0.1c0,0.3,0,0.5-0.1,0.8
 c0.6,0.1,1.3-0.1,1.9-0.4l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,16.6,29.2,16.3,29,16.2z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M29,23.2c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.7,0.4-1.7,0.4-2.3-0.1c-0.9-0.6-2.2-0.7-3.2-0.1l-0.3,0.2
 c-0.7,0.4-1.7,0.4-2.3-0.1c-0.9-0.6-2.2-0.7-3.2-0.1c-0.2,0.1-0.3,0.4-0.2,0.6c0.1,0.2,0.4,0.3,0.6,0.2c0.7-0.4,1.7-0.4,2.3,0.1
 c0.5,0.3,1.1,0.5,1.7,0.5c0.5,0,1.1-0.1,1.5-0.4l0.3-0.2c0.7-0.4,1.7-0.4,2.3,0.1c0.9,0.6,2.3,0.7,3.2,0.1l0.4-0.2
 c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,23.6,29.2,23.4,29,23.2z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M29,18.5c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.5,0.3-1.2,0.4-1.8,0.2c-0.1,0.3-0.2,0.5-0.4,0.8
 c0.9,0.3,1.9,0.3,2.7-0.2l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,18.9,29.2,18.7,29,18.5z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M17.1,22.3c-1.1,0-2.2-0.2-3.2-0.7c-1.1,0.5-2.3,0.7-3.5,0.7c-4.2,0-7.7-2.9-7.7-6.5c0-2.6,1.8-5,4.6-6
 c0.9-1.9,3.2-3.2,5.6-3.2c3.2,0,5.9,2.1,6.1,4.8c2.7,0.7,4.6,2.9,4.6,5.3C23.6,19.8,20.7,22.3,17.1,22.3z
 M13.9,19.7l0.4,0.2
diff --git a/res/drawable/ic_media_bigscreen.xml b/res/drawable/ic_media_bigscreen.xml
index 5413f8599..aaab4e40e 100644
--- a/res/drawable/ic_media_bigscreen.xml
+++ b/res/drawable/ic_media_bigscreen.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M112.9,72.9l7.1,-7.1l-5.8,-5.8l-7.1,7.1L100,60v20h20L112.9,72.9zM67.1,107.1l-7.1,7.1l5.8,5.8l7.1,-7.1L80,120v-20H60L67.1,107.1zM120,100h-20v20l7.1,-7.1l7.1,7.1l5.8,-5.8l-7.1,-7.1L120,100zM65.8,60L60,65.8l7.1,7.1L60,80h20V60l-7.1,7.1L65.8,60z" />
 </vector>
diff --git a/res/drawable/ic_media_cropscreen.xml b/res/drawable/ic_media_cropscreen.xml
index 66a24e335..a867cace4 100644
--- a/res/drawable/ic_media_cropscreen.xml
+++ b/res/drawable/ic_media_cropscreen.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M60,76h6V66h10v-6H60V76zM66,104h-6v16h16v-6H66V104zM104,60v6h10v10h6V60H104zM114,114h-10v6h16v-16h-6V114zM70,80L60,90l10,10V80zM110,100l10,-10l-10,-10V100zM90,120l10,-10H80L90,120zM80,70h20L90,60L80,70z" />
 </vector>
diff --git a/res/drawable/ic_media_fullscreen.xml b/res/drawable/ic_media_fullscreen.xml
index 104a8b68b..51e024b42 100644
--- a/res/drawable/ic_media_fullscreen.xml
+++ b/res/drawable/ic_media_fullscreen.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M80,60H60v20l7.1,-7.1l7.1,7.1l5.8,-5.8l-7.1,-7.1L80,60zM100,60l7.1,7.1l-7.1,7.1l5.8,5.8l7.1,-7.1L120,80V60H100zM74.2,100l-7.1,7.1L60,100v20h20l-7.1,-7.1l7.1,-7.1L74.2,100zM105.8,100l-5.8,5.8l7.1,7.1L100,120h20v-20l-7.1,7.1L105.8,100z" />
 </vector>
diff --git a/res/drawable/ic_vidcontrol_pause.xml b/res/drawable/ic_vidcontrol_pause.xml
index f3b6d0111..cd1725360 100644
--- a/res/drawable/ic_vidcontrol_pause.xml
+++ b/res/drawable/ic_vidcontrol_pause.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M66,58h16v64H66V58zM98,58h16v64H98V58z" />
 </vector>
diff --git a/res/drawable/ic_vidcontrol_play.xml b/res/drawable/ic_vidcontrol_play.xml
index e58e93283..d58c6d742 100644
--- a/res/drawable/ic_vidcontrol_play.xml
+++ b/res/drawable/ic_vidcontrol_play.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M70,58v64l50,-32L70,58z" />
 </vector>
diff --git a/res/drawable/more.xml b/res/drawable/more.xml
index ae6b4ea77..d33979f10 100644
--- a/res/drawable/more.xml
+++ b/res/drawable/more.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/more2.xml b/res/drawable/more2.xml
index 5f3c9888a..8675d8fdf 100644
--- a/res/drawable/more2.xml
+++ b/res/drawable/more2.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="36.0">
     <path
         android:pathData="M18,13c1.381,0 2.5,-1.119 2.5,-2.5S19.381,8 18,8s-2.5,1.119 -2.5,2.5S16.619,13 18,13zM18,15.5c-1.381,0 -2.5,1.119 -2.5,2.5s1.119,2.5 2.5,2.5s2.5,-1.119 2.5,-2.5S19.381,15.5 18,15.5zM18,23c-1.381,0 -2.5,1.119 -2.5,2.5S16.619,28 18,28s2.5,-1.119 2.5,-2.5S19.381,23 18,23z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/multiselect.xml b/res/drawable/multiselect.xml
index 9b2137006..053507d86 100644
--- a/res/drawable/multiselect.xml
+++ b/res/drawable/multiselect.xml
@@ -37,5 +37,5 @@
         android:fillColor="#2196F3"/>
     <path
         android:pathData="M10,17l-5,-5l1.4099998,-1.4099998l3.5900002,3.58l7.59,-7.59l1.4099998,1.4200001z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/multiselect_delete.xml b/res/drawable/multiselect_delete.xml
index 6ac9b0f35..b3faf7b28 100644
--- a/res/drawable/multiselect_delete.xml
+++ b/res/drawable/multiselect_delete.xml
@@ -33,7 +33,7 @@
     android:viewportWidth="72.0"
     android:viewportHeight="72.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M59,10L46.92,10l-2.16,-4L27,6l-2.16,4L13,10a1,1 0,0 0,-1 1v4a1,1 0,0 0,1 1h46a1,1 0,0 0,1 -1L60,11A1,1 0,0 0,59 10ZM16,60a6,6 0,0 0,6 6h28a6,6 0,0 0,6 -6L56,20L16,20v40Z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/multiselect_more.xml b/res/drawable/multiselect_more.xml
index a0f6e7dc8..a8a23dec3 100644
--- a/res/drawable/multiselect_more.xml
+++ b/res/drawable/multiselect_more.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/multiselect_share.xml b/res/drawable/multiselect_share.xml
index 30f50c026..5c265c02c 100644
--- a/res/drawable/multiselect_share.xml
+++ b/res/drawable/multiselect_share.xml
@@ -33,7 +33,7 @@
     android:viewportWidth="72.0"
     android:viewportHeight="72.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M54,48c-2.4,0 -4.5,0.9 -6.1,2.4L26.7,38.3c0.2,-0.8 0.3,-1.5 0.3,-2.4c0,-0.8 -0.1,-1.6 -0.3,-2.4l21.2,-12.1c1.6,1.7 3.7,2.6 6.1,2.6c5,0 9,-4 9,-9s-4,-9 -9,-9s-9,4 -9,9c0,0.8 0.1,1.6 0.3,2.3L24.1,29.4C22.5,27.9 20.4,27 18,27c-5,0 -9,4 -9,9s4,9 9,9c2.4,0 4.5,-0.9 6.1,-2.4l21.2,12.1C45.1,55.4 45,56.2 45,57c0,5 4,9 9,9s9,-4 9,-9S59,48 54,48z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/multiselected_back.xml b/res/drawable/multiselected_back.xml
index dcd03f5af..0e237bfc2 100644
--- a/res/drawable/multiselected_back.xml
+++ b/res/drawable/multiselected_back.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/overflow.xml b/res/drawable/overflow.xml
index b507ea444..15d6b5312 100644
--- a/res/drawable/overflow.xml
+++ b/res/drawable/overflow.xml
@@ -37,7 +37,7 @@
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M12,8c1.1,0,2-0.9,2-2s-0.9-2-2-2c-1.1,0-2,0.9-2,2S10.9,8,12,8z
 M12,10c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2 c1.1,0,2-0.9,2-2C14,10.9,13.1,10,12,10z
 M12,16c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S13.1,16,12,16z" />
diff --git a/res/drawable/seestraight.xml b/res/drawable/seestraight.xml
index 562ccde23..317fa4ede 100644
--- a/res/drawable/seestraight.xml
+++ b/res/drawable/seestraight.xml
@@ -34,29 +34,29 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 7.2 23.3 L 5.5 23.3 L 5.5 7.1 L 13.3 4.8 L 14.1 4.8 L 21.7 7.1 L 21.7 11.9 L 20 11.9 L 20 8.3 L 13.7 6.5 L 13.4 6.5 L 7.2 8.3 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 8.6 7 L 8 7 L 8 5.3 L 13.5 3.5 L 19.1 5.3 L 19.1 7 L 18.6 7 L 18.6 5.7 L 13.5 4.1 L 8.6 5.7 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 13.4 3.8 H 13.7 V 5.6 H 13.4 V 3.8 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 13 23.3 L 12.7 23.3 L 12.7 8.4 L 6.5 10.2 L 6.5 9.9 L 13 8.1 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 14.4 23.3 L 14.1 23.3 L 14.1 8 L 20.7 9.8 L 20.6 10.1 L 14.4 8.3 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M29.8,27h-1.7v-1.4h1.7V27z M26.3,27h-1.8v-1.4h1.8V27z M22.6,27h-1.8v-1.4h1.8V27z
 M18.9,27h-1.8v-1.4 h1.8V27z M15.3,27h-1.8v-1.4h1.8V27z M11.6,27H9.8v-1.4h1.8V27z
 M8,27H6.2v-1.4H8V27z M4.3,27H2.5v-1.4h1.8V27z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 26.7 23.3 L 25 23.3 L 25 13.4 L 22.3 12.3 L 19.6 13.4 L 19.6 23.3 L 17.8 23.3 L 17.8 12.2 L 22 10.6 L 22.6 10.6 L 26.7 12.2 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M 22.2 11.6 H 22.5 V 23.3 H 22.2 V 11.6 Z" />
 </vector>
diff --git a/res/drawable/share.xml b/res/drawable/share.xml
index bd05d1569..0ce3de878 100644
--- a/res/drawable/share.xml
+++ b/res/drawable/share.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M17.999,16.121c-0.76,0 -1.439,0.3 -1.96,0.77L8.91,12.741C8.959,12.512 9,12.281 9,12.041s-0.04,-0.471 -0.09,-0.7l7.049,-4.11c0.54,0.5 1.25,0.81 2.04,0.81c1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3s-3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.851C7.5,9.351 6.79,9.041 6,9.041c-1.66,0 -3,1.34 -3,3c0,1.661 1.34,3 3,3c0.79,0 1.5,-0.311 2.04,-0.811l7.12,4.16c-0.051,0.211 -0.08,0.43 -0.08,0.65c0,1.609 1.311,2.92 2.92,2.92s2.92,-1.311 2.92,-2.92S19.608,16.121 17.999,16.121z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/sliderbg.xml b/res/drawable/sliderbg.xml
index efc809f4b..204c9259e 100644
--- a/res/drawable/sliderbg.xml
+++ b/res/drawable/sliderbg.xml
@@ -35,5 +35,5 @@
     <path
         android:pathData="M0,1h216v2h-216z"
         android:fillAlpha="0.2"
-        android:fillColor="#99FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/slideshow.xml b/res/drawable/slideshow.xml
index 1b044bb04..dfe8c9c69 100644
--- a/res/drawable/slideshow.xml
+++ b/res/drawable/slideshow.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M10,8v8l5,-4L10,8zM19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/white"/>
 </vector>
diff --git a/res/drawable/spinner_triangle.xml b/res/drawable/spinner_triangle.xml
index a2f314153..100005962 100644
--- a/res/drawable/spinner_triangle.xml
+++ b/res/drawable/spinner_triangle.xml
@@ -31,5 +31,5 @@
 <vector android:autoMirrored="true" android:height="12dp"
     android:viewportHeight="12.0" android:viewportWidth="12.0"
     android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.3" android:fillColor="#FFFFFF" android:pathData="M12,3.7V12H3.7L12,3.7z"/>
+    <path android:fillAlpha="0.3" android:fillColor="@color/white" android:pathData="M12,3.7V12H3.7L12,3.7z"/>
 </vector>
diff --git a/res/drawable/timeline.xml b/res/drawable/timeline.xml
index d5ba75b2e..8d6dc37da 100644
--- a/res/drawable/timeline.xml
+++ b/res/drawable/timeline.xml
@@ -33,11 +33,11 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M19.057,4.034h-1.01V2.059h-2.016v1.976H7.969V2.059H5.951v1.976H4.902c-1.115,0 -1.967,0.943 -1.967,2.058l-0.01,13.832c0,1.114 0.902,2.017 2.016,2.017h14.115c1.113,0 2.016,-0.902 2.016,-2.017V6.092C21.072,4.978 20.17,4.034 19.057,4.034zM19.098,19.965H4.941V9.015h14.156V19.965z"
         android:fillAlpha="0.54"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M6.184,16.241l3.738,-4.984l2.908,3.742l2.076,-2.496l2.907,3.738H6.184z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/truescanner.xml b/res/drawable/truescanner.xml
index 49236ef07..c79f58501 100644
--- a/res/drawable/truescanner.xml
+++ b/res/drawable/truescanner.xml
@@ -33,31 +33,31 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M15.1,23.4c0,0.8,0,1.6,0,2.3c-4,0-7.9,0-11.9,0c0-6.7,0-13.4,0-20c4,0,7.9,0,11.9,0c0,0.8,0,1.5,0,2.3
 c-3.2,0-6.4,0-9.6,0c0,5.1,0,10.2,0,15.4C8.7,23.4,11.9,23.4,15.1,23.4z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M15.1,10c0,0,0,0.1,0,0.1c0,1.9,0,3.7,0,5.6c0,0.1,0,0.2-0.1,0.3c-0.1,0.2-0.2,0.4-0.3,0.6c0,0,0,0.1,0,0.1
 c0.1,0,0.3,0,0.4,0c0,0.8,0,1.5,0,2.2c-0.1,0-0.2,0-0.3,0c-0.3,0-0.7,0-1,0c-0.1,0-0.1,0-0.2,0.1c-0.4,0.8-0.7,1.6-1.1,2.4
 c0,0.1-0.1,0.1-0.1,0.1c-0.9,0-1.8,0-2.8,0c0,0,0,0-0.1,0C11.4,17.7,13.2,13.9,15.1,10C15.1,10,15.1,10,15.1,10z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M17,16.4c0,4.2,0,8.4,0,12.5c0,0.3-0.2,0.5-0.4,0.5c-0.3,0-0.5-0.2-0.5-0.4c0,0,0-0.1,0-0.1
 c0-8.3,0-16.7,0-25c0-0.1,0-0.2,0-0.2c0.1-0.2,0.3-0.4,0.5-0.3c0.2,0,0.4,0.2,0.4,0.5c0,0,0,0.1,0,0.1C17,8.1,17,12.3,17,16.4z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M28.7,6.5c0,6.1,0,12.2,0,18.3c-3.4,0-6.9,0-10.3,0c0-0.1,0-0.2,0-0.3c3.3,0,6.7,0,10,0
 c0-5.9,0-11.8,0-17.7c-3.3,0-6.6,0-9.9,0c0-0.1,0-0.2,0-0.3C21.9,6.5,25.3,6.5,28.7,6.5z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M18,9.6c1.9,4,3.8,8,5.7,12.1c-0.1,0-0.1,0-0.1,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2-0.1
 c-0.4-0.8-0.7-1.6-1.1-2.4c0-0.1-0.1-0.1-0.2-0.1c-0.3,0-0.7,0-1,0c0,0-0.1,0-0.1,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0
 c0.4,0,0.9,0,1.3,0c0.1,0,0.1,0,0.2,0.1c0.4,0.8,0.7,1.6,1.1,2.4c0,0.1,0.1,0.1,0.2,0.1c0.8,0,1.5,0,2.3,0c0,0,0.1,0,0.1,0
 c-0.1-0.2-0.2-0.5-0.3-0.7c-1.6-3.3-3.1-6.6-4.7-9.9c0,0,0-0.1,0-0.1C17.9,10.4,17.9,10,18,9.6C18,9.7,18,9.6,18,9.6
 C18,9.6,18,9.6,18,9.6z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M18.6,16.8c-0.2,0-0.4,0-0.6,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0c-0.2-0.3-0.1-0.7-0.1-1
 C18.2,15.9,18.4,16.4,18.6,16.8z" />
 </vector>
diff --git a/res/drawable/videos.xml b/res/drawable/videos.xml
index 00f09d565..406d41dee 100644
--- a/res/drawable/videos.xml
+++ b/res/drawable/videos.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/black"
         android:pathData="M3.999,6h-2v14c0,1.1 0.9,2 2,2h14v-2h-14V6zM19.999,2h-12c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C21.999,2.9 21.099,2 19.999,2zM11.999,14.5v-9l6,4.5L11.999,14.5z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/layout-land/on_screen_hint.xml b/res/layout-land/on_screen_hint.xml
index 59b0d1a63..7406d0a8e 100644
--- a/res/layout-land/on_screen_hint.xml
+++ b/res/layout-land/on_screen_hint.xml
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textAppearance="@style/OnScreenHintTextAppearance.Small"
-            android:textColor="#ffffffff"
+            android:textColor="@color/white"
             android:shadowColor="#BB000000"
             android:shadowRadius="2.75" />
 </LinearLayout>
diff --git a/res/layout-port/on_screen_hint.xml b/res/layout-port/on_screen_hint.xml
index 467b67f78..7a24f7dc7 100644
--- a/res/layout-port/on_screen_hint.xml
+++ b/res/layout-port/on_screen_hint.xml
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textAppearance="@style/OnScreenHintTextAppearance.Small"
-            android:textColor="#ffffffff"
+            android:textColor="@color/white"
             android:shadowColor="#BB000000"
             android:shadowRadius="2.75" />
 </LinearLayout>
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index ec4704d92..efa920dda 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -32,7 +32,7 @@
                 style="?android:attr/actionButtonStyle"
                 android:divider="?android:attr/listDividerAlertDialog"
                 android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-                android:textColor="#8A000000"
+                android:textColor="@color/black_transparent_4"
                 android:textSize="20sp"
                 android:singleLine="true"
                 android:gravity="start|center_vertical"
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 6fbc62114..7230addd7 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -53,9 +53,9 @@
         <TextView
             android:id="@+id/pano_stitching_progress_text"
             android:text="@string/pano_progress_text"
-            android:textColor="#ffffffff"
+            android:textColor="@color/white"
             android:textSize="14dp"
-            android:shadowColor="#ff000000"
+            android:shadowColor="@color/black"
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="2"
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
index aee19831e..bee765604 100644
--- a/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@ -48,7 +48,7 @@
         android:textSize="12sp"
         android:layout_centerVertical="true"
         android:fontFamily="sans-serif-medium"
-        android:textColor="#000000"
+        android:textColor="@color/black"
         android:alpha="0.87"
         android:layout_marginStart="64dp"
        />
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index 60088e0a1..a71e933ab 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -40,6 +40,6 @@
         android:text="@string/save"
         android:textAllCaps="true"
         android:layout_gravity="center_vertical|right"
-        android:textColor="#ffffff" />
+        android:textColor="@color/white" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/filtershow_actionbar_effects.xml b/res/layout/filtershow_actionbar_effects.xml
index b14a0a766..48ed3b397 100644
--- a/res/layout/filtershow_actionbar_effects.xml
+++ b/res/layout/filtershow_actionbar_effects.xml
@@ -53,7 +53,7 @@
             android:drawableEnd="@drawable/spinner_triangle"
             android:gravity="center"
             android:text="@string/apply_effect"
-            android:textColor="#ffffff"
+            android:textColor="@color/white"
             android:textSize="16sp" />
     </LinearLayout>
 
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index 39770c6e8..4f3177051 100644
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -57,7 +57,7 @@
 <!--                 android:layout_height="@dimen/swap_button_height" -->
 <!--                 android:text="@string/apply_effect" -->
 <!--                 android:layout_gravity="left" -->
-<!--                 android:textColor="#ffffff" -->
+<!--                 android:textColor="@color/white" -->
 <!--                 android:textSize="20sp"  -->
 <!--                 android:layout_weight="1"/> -->
 
@@ -79,4 +79,4 @@
             android:visibility="gone" />
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml
index 8aa2c07eb..31d67c5ea 100644
--- a/res/layout/gallery_main.xml
+++ b/res/layout/gallery_main.xml
@@ -58,7 +58,7 @@
         android:layout_width="270dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="#fafafa"
+        android:background="@color/white"
         android:clickable="true" >
 
         <!-- Header -->
@@ -78,7 +78,7 @@
                 android:layout_marginStart="16dp"
                 android:fontFamily="sans-serif"
                 android:text="@string/navigation_drawer_title"
-                android:textColor="#ffffff"
+                android:textColor="@color/white"
                 android:textSize="24sp" />
         </RelativeLayout>
 
diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml
index 57b78320b..1acbd77cb 100644
--- a/res/layout/photopage_progress_bar.xml
+++ b/res/layout/photopage_progress_bar.xml
@@ -9,7 +9,7 @@
         android:visibility="invisible">
         <View
                 android:id="@+id/photopage_progress_background"
-                android:background="#ff000000"
+                android:background="@color/black"
                 android:layout_width="match_parent"
                 android:layout_height="8dp"
                 android:layout_alignParentBottom="true"
@@ -25,9 +25,9 @@
         <TextView
                 android:id="@+id/photopage_progress_bar_text"
                 android:text="@string/pano_progress_text"
-                android:textColor="#ffffffff"
+                android:textColor="@color/white"
                 android:textSize="14dp"
-                android:shadowColor="#ff000000"
+                android:shadowColor="@color/black"
                 android:shadowDx="0"
                 android:shadowDy="0"
                 android:shadowRadius="2"
diff --git a/res/layout/popup_list_item.xml b/res/layout/popup_list_item.xml
index f0bafc1e8..0fad174aa 100644
--- a/res/layout/popup_list_item.xml
+++ b/res/layout/popup_list_item.xml
@@ -20,7 +20,7 @@
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
     android:textSize="20sp"
-    android:textColor="#8A000000"
+    android:textColor="@color/black_transparent_4"
     android:singleLine="true"
     android:gravity="center_vertical"
     android:paddingStart="16dp"
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
index 054d97c84..cf9b8a9ca 100644
--- a/res/layout/toolbar.xml
+++ b/res/layout/toolbar.xml
@@ -31,12 +31,11 @@
 <Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/toolbar_height"
-    android:paddingTop="26dp"
-    android:background="@color/toolbar_theme"
-    android:elevation="4dp"
+    android:paddingTop="24dp"
+    android:background="@color/primary"
+    android:elevation="8dp"
     android:theme="@style/ToolbarTheme"
     android:titleTextAppearance="@style/ToolbarTitleStyle"
-    android:popupTheme="@style/ToolbarPopUpTheme"
-    android:navigationIcon="@drawable/drawer" >
+    android:popupTheme="@style/ToolbarPopUpTheme" >
 
-</Toolbar>
\ No newline at end of file
+</Toolbar>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index dac58a24a..cee058d86 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -57,7 +57,7 @@
         <item name="android:layout_marginTop">13dp</item>
     </style>
         <style name="PanoViewHorizontalBar">
-        <item name="android:background">#000000</item>
+        <item name="android:background">@color/black</item>
         <item name="android:alpha">1.0</item>
         <item name="android:layout_height">0dp</item>
         <item name="android:layout_width">match_parent</item>
diff --git a/res/values/bool.xml b/res/values/bool.xml
index 3412d825d..947ed1e57 100755
--- a/res/values/bool.xml
+++ b/res/values/bool.xml
@@ -20,4 +20,5 @@
     <bool name="stereo">true</bool>
     <bool name="streaming">true</bool>
     <bool name="speaker">true</bool>
+    <bool name="picker_is_dialog">false</bool>
 </resources>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
new file mode 100644
index 000000000..70fc269a8
--- /dev/null
+++ b/res/values/cm_colors.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<resources>
+
+    <color name="primary">#333333</color>
+    <color name="primaryDark">#000000</color>
+    <color name="accent">#33b5e5</color>
+
+    <color name="white">#fafafa</color>
+    <color name="black">#212121</color>
+
+    <color name="light_black">#424242</color>
+
+    <color name="black_transparent_1">#1a000000</color>
+    <color name="black_transparent_2">#26000000</color>
+    <color name="black_transparent_3">#75000000</color>
+    <color name="black_transparent_4">#8A000000</color>
+    <color name="black_transparent_5">#C1000000</color>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6c4a79178..d509fe8d4 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,58 +15,60 @@
 -->
 <resources>
 
-    <color name="default_background">#fafafa</color>
+    <color name="default_background">@color/white</color>
 
     <!-- configuration for album set page -->
-    <color name="albumset_background">#fafafa</color>
-    <color name="albumset_placeholder">#75000000</color>
-    <color name="albumset_label_background">#8A000000</color> <!-- 54% alpha -->
-    <color name="albumset_label_title">#FFFFFF</color>
-    <color name="albumset_label_count">#FFFFFF</color>
-    <color name="albumlist_label_title">#8E000000</color>
+    <color name="albumset_background">@color/white</color>
+    <color name="albumset_placeholder">@color/black_transparent_3</color>
+    <color name="albumset_label_background">@color/black_transparent_4</color>
+    <color name="albumset_label_title">@color/white</color>
+    <color name="albumset_label_count">@color/white</color>
+    <color name="albumlist_label_title">@color/black_transparent_4</color>
+
+    <color name="darker_transparent">@color/black_transparent_5</color>
 
     <!-- configuration for album page -->
-    <color name="album_background">#fafafa</color>
-    <color name="album_placeholder">#75000000</color>
+    <color name="album_background">@color/white</color>
+    <color name="album_placeholder">@color/white</color>
 
     <!-- configuration for photo page -->
-    <color name="photo_background">#1A1A1A</color>
-    <color name="photo_placeholder">#333</color>
+    <color name="photo_background">@color/primary</color>
+    <color name="photo_placeholder">@color/light_black</color>
     <color name="photo_page_action_bar">#8A000000</color>
     <color name="photo_page_bottom_panel">#8A000000</color>
 
     <!-- configuration for manage cache page -->
-    <color name="cache_background">#1A1A1A</color>
-    <color name="cache_placeholder">#333</color>
+    <color name="cache_background">@color/primary</color>
+    <color name="cache_placeholder">@color/light_black</color>
 
-    <color name="bitmap_screennail_placeholder">#333</color>
+    <color name="bitmap_screennail_placeholder">@color/light_black</color>
 
-    <color name="slideshow_background">#1A1A1A</color>
+    <color name="slideshow_background">@color/light_black</color>
 
     <color name="button_dark_transparent_background">#6000</color>
 
     <color name="ingest_highlight_semitransparent">#8833b5e5</color>
-    <color name="ingest_date_tile_text">#33b5e5</color>
+    <color name="ingest_date_tile_text">@color/accent</color>
 
     <!-- Camera resources below -->
 
-    <color name="recording_time_elapsed_text">#FFFFFFFF</color>
+    <color name="recording_time_elapsed_text">@color/white</color>
     <color name="recording_time_remaining_text">#FFFF0033</color>
     <color name="on_viewfinder_label_background_color">#77333333</color>
-    <color name="review_control_pressed_color">#FF33B5E5</color>
+    <color name="review_control_pressed_color">@color/accent</color>
     <color name="review_control_pressed_fan_color">#3F33B5E5</color>
-    <color name="review_background">#FF000000</color>
+    <color name="review_background">@color/black</color>
     <color name="icon_disabled_color">#DD777777</color>
     <color name="time_lapse_arc">#FFC5C5C5</color>
     <color name="indicator_background">#40000000</color>
-    <color name="popup_title_color">#ff33b5e5</color>
+    <color name="popup_title_color">@color/accent</color>
     <color name="popup_background">#ff282828</color>
     <color name="pano_progress_empty">#FF2E2E2E</color>
     <color name="pano_progress_done">#FF33525E</color>
     <color name="pano_progress_indication">#FF0099CC</color>
     <color name="pano_progress_indication_fast">#FFFF2222</color>
-    <color name="mode_selection_border">#33B5E5</color>
-    <color name="holo_blue_light">#ff33b5e5</color>
+    <color name="mode_selection_border">@color/accent</color>
+    <color name="holo_blue_light">@color/accent</color>
     <color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color>
     <color name="bright_foreground_holo_dark">#fff3f3f3</color>
     <color name="face_detect_start">#80ffffff</color>
@@ -78,12 +80,12 @@
     <color name="lowlight">#650101</color>
     <color name="grey">#e7e7e7</color>
     <color name="disabled_knob">#575757</color>
-    <color name="toolbar_theme">#e53935</color>
-    <color name="multiselect_background">#ffffff</color>
-    <color name="edit_background">#212121</color>
-    <color name="edit_actionbar_background">#8A000000</color>
+    <color name="toolbar_theme">@color/primary</color>
+    <color name="multiselect_background">@color/white</color>
+    <color name="edit_background">@color/black</color>
+    <color name="edit_actionbar_background">@color/black</color>
     <color name="dialog_button_color">#009688</color>
-    <color name="timeline_title_text_color">#8A000000</color>
-    <color name="timeline_title_number_text_color">#42000000</color>
-    <color name="timeline_title_background_color">#fafafa</color>
+    <color name="timeline_title_text_color">@color/black_transparent_4</color>
+    <color name="timeline_title_number_text_color">@color/black_transparent_3</color>
+    <color name="timeline_title_background_color">@color/white</color>
 </resources>
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index 666651b2c..f9b05d9f3 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -19,7 +19,7 @@
     <color name="green">#00FF00</color>
     <color name="red">#FF0000</color>
     <color name="blue">#0000FF</color>
-    <color name="text_toolbar">#FFFFFF</color>
+    <color name="text_toolbar">@color/white</color>
     <color name="background_screen">#212121</color>
     <color name="background_toolbar">#363949</color>
     <color name="background_main_toolbar">#232323</color>
@@ -32,20 +32,20 @@
     <color name="filtershow_stateview_end_background">#232323</color>
     <color name="filtershow_stateview_end_text">#a7a7a7</color>
     <color name="filtershow_stateview_background">#464646</color>
-    <color name="filtershow_stateview_text">#FFFFFF</color>
+    <color name="filtershow_stateview_text">@color/white</color>
     <color name="filtershow_stateview_selected_background">#c8c8c8</color>
-    <color name="filtershow_stateview_selected_text">#000000</color>
+    <color name="filtershow_stateview_selected_text">@color/black</color>
     <color name="filtershow_categoryview_background">#1a1a1a</color>
-    <color name="filtershow_categoryview_text">#ffffff</color>
+    <color name="filtershow_categoryview_text">@color/white</color>
     <color name="filtershow_category_selection">#4592F9</color>
-    <color name="gradcontrol_point_center">#ffffffff</color>
-    <color name="gradcontrol_point_edge">#ffffffff</color>
+    <color name="gradcontrol_point_center">@color/white</color>
+    <color name="gradcontrol_point_edge">@color/white</color>
     <color name="gradcontrol_graypoint_center">#888888</color>
     <color name="gradcontrol_graypoint_edge">#BBBBBB</color>
     <color name="gradcontrol_point_shadow_start">#66000000</color>
-    <color name="gradcontrol_point_shadow_end">#00000000</color>
-    <color name="gradcontrol_line_color">#FFFFFF</color>
-    <color name="gradcontrol_line_shadow">#000000</color>
+    <color name="gradcontrol_point_shadow_end">@android:color/transparent</color>
+    <color name="gradcontrol_line_color">@color/white</color>
+    <color name="gradcontrol_line_shadow">@color/black</color>
     <color name="draw_rect_border">#888888</color>
     <color name="color_chooser_unslected_border">#3d4040</color>
     <color name="color_chooser_slected_border">#a7a7a7</color>
@@ -70,4 +70,4 @@
     <color name="crop_text_color">#4f92e9</color>
     <color name="watermark_text_color">#80ffffff</color>
     <color name="watermark_highlight_color">#4592F9</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dc4b9ae7d..28af6c702 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,10 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <style name="Theme.GalleryBase" parent="android:Theme.Holo">
+    <style name="Theme.GalleryBase" parent="android:Theme.Material">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primaryDark</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="listPreferredItemHeightSmall">48dp</item>
         <item name="switchStyle">@android:style/Widget.CompoundButton</item>
     </style>
@@ -23,6 +26,9 @@
     <style name="Theme.Gallery.Dialog" parent="android:Theme.Holo.Dialog" />
 
     <style name="Theme.Gallery" parent="android:Theme.Material.Light">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primaryDark</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
@@ -46,12 +52,12 @@
     <style name="Theme.Crop" parent="Theme.GalleryBase">
         <item name="android:displayOptions"></item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
+        <item name="android:actionBarStyle">@style/Material.ActionBar</item>
         <item name="android:colorBackground">@null</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowBackground">@drawable/filtershow_tiled_background</item>
     </style>
-    <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar">
+    <style name="Material.ActionBar" parent="android:Widget.Material.ActionBar">
         <item name="android:displayOptions">useLogo|showHome</item>
         <item name="android:background">@drawable/actionbar_translucent</item>
         <item name="android:backgroundStacked">@null</item>
@@ -64,10 +70,9 @@
     </style>
     <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar">
     </style>
-    <bool name="picker_is_dialog">false</bool>
-    <color name="darker_transparent">#C1000000</color>
-    <style name="ActionBarTwoLinePrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"></style>
-    <style name="ActionBarTwoLineSecondary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"></style>
+
+    <style name="ActionBarTwoLinePrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
+    <style name="ActionBarTwoLineSecondary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"/>
     <style name="ActionBarTwoLineItem">
         <item name="android:background">@drawable/action_bar_two_line_background</item>
     </style>
@@ -341,13 +346,13 @@
     <style name="ToolbarPopUpTheme" parent="android:Theme.Material.Light" />
 
     <!-- Styles -->
-    <style name="MyOverFlow" parent="@android:style/Widget.DeviceDefault.ActionButton">
+    <style name="MyOverFlow" parent="@android:style/Widget.Material.ActionButton.Overflow">
         <item name="android:src">@drawable/multiselect_more</item>
     </style>
-    <style name="WhiteOverflow" parent="@android:style/Widget.DeviceDefault.ActionButton">
+    <style name="WhiteOverflow" parent="@android:style/Widget.Material.ActionButton.Overflow">
         <item name="android:src">@drawable/more</item>
     </style>
-    <style name="FilterShowActionBar" parent="@android:style/Widget.DeviceDefault.Light.ActionBar">
+    <style name="FilterShowActionBar" parent="@android:style/Widget.Material.Light.ActionBar">
         <item name="android:background">@color/edit_actionbar_background</item>
         <item name="android:contentInsetStart">0dp</item>
     </style>
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 75653036f..dcea7c48c 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -458,7 +458,8 @@ public class GalleryActionBar {
 
     public void setBackGroundDefault()
     {
-        mActionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#e53935")));
+        mActionBar.setBackgroundDrawable(new ColorDrawable(
+                mContext.getResources().getColor(R.color.primary)));
     }
 
 
diff --git a/src/com/android/gallery3d/ui/PopupList.java b/src/com/android/gallery3d/ui/PopupList.java
index a9aa2570f..37c0b87a0 100644
--- a/src/com/android/gallery3d/ui/PopupList.java
+++ b/src/com/android/gallery3d/ui/PopupList.java
@@ -156,7 +156,8 @@ public class PopupList {
     private PopupWindow createPopupWindow() {
         PopupWindow popup = new PopupWindow(mContext, null, android.R.attr.popupMenuStyle);
         popup.setOnDismissListener(mOnDismissListener);
-        popup.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#ffffff")));
+        popup.setBackgroundDrawable(new ColorDrawable(
+                mContext.getResources().getColor(R.color.white)));
 
 //        popup.setBackgroundDrawable(mContext.getResources().getDrawable(
 //                R.drawable.menu_dropdown_panel_holo_dark));
-- 
cgit v1.2.3