From f5eb9b3047a43f62fcba325531ec9c7a576dd042 Mon Sep 17 00:00:00 2001
From: Tomasz Mikolajewski <mtomasz@google.com>
Date: Tue, 28 Jul 2015 14:59:00 +0900
Subject: [PATCH] Update colors for the standalone activity of DocumentsUI.

BUG=None

Change-Id: Iaf1f9bed243654d1378f0b23c72f128dcbb291f6
---
 packages/DocumentsUI/res/values/colors.xml            |  6 ++++++
 packages/DocumentsUI/res/values/styles.xml            | 11 ++++++++---
 .../com/android/documentsui/DirectoryFragment.java    |  4 ++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml
index fd0518b260a98..c6f428a336d6f 100644
--- a/packages/DocumentsUI/res/values/colors.xml
+++ b/packages/DocumentsUI/res/values/colors.xml
@@ -17,8 +17,14 @@
 <resources>
     <color name="material_grey_50">#fffafafa</color>
     <color name="material_grey_300">#ffeeeeee</color>
+    <color name="material_grey_600">#ff757575</color>
+    <color name="material_grey_800">#ff424242</color>
+    <color name="material_blue_700">#ff1976d2</color>
+    <color name="material_blue_500">#ff2196f3</color>
 
     <color name="directory_background">@color/material_grey_300</color>
     <color name="item_doc_grid_background">#FFFFFFFF</color>
     <color name="item_doc_grid_protect_background">#88000000</color>
+    <color name="status_bar_background">@color/material_blue_700</color>
+    <color name="action_mode_status_bar_background">@color/material_grey_800</color>
 </resources>
diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml
index a9e7ac7a8869a..a1ad7e4616bcf 100644
--- a/packages/DocumentsUI/res/values/styles.xml
+++ b/packages/DocumentsUI/res/values/styles.xml
@@ -54,12 +54,17 @@
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
     </style>
 
+    <style name="ActionModeStyle" parent="@android:style/Widget.Material.Light.ActionMode">
+        <item name="android:background">@color/material_grey_600</item>
+    </style>
+
     <style name="StandaloneTheme" parent="@android:style/Theme.Material.DayNight.DarkActionBar">
         <item name="android:actionBarWidgetTheme">@null</item>
 
-        <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item>
-        <item name="android:colorPrimary">@*android:color/material_blue_grey_800</item>
-        <item name="android:colorAccent">@*android:color/material_deep_teal_500</item>
+        <item name="android:colorPrimaryDark">@color/status_bar_background</item>
+        <item name="android:colorPrimary">@color/material_blue_500</item>
+        <item name="android:colorAccent">@color/material_blue_700</item>
+        <item name="android:actionModeStyle">@style/ActionModeStyle</item>
 
         <item name="android:listDivider">@*android:drawable/list_divider_material</item>
 
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index 8eb2ff69d8f05..4cd38711dbb6c 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -605,6 +605,8 @@ public class DirectoryFragment extends Fragment {
                 if (mActionMode == null) {
                     if (DEBUG) Log.d(TAG, "Yeah. Starting action mode.");
                     mActionMode = getActivity().startActionMode(this);
+                    getActivity().getWindow().setStatusBarColor(
+                        getResources().getColor(R.color.action_mode_status_bar_background));
                 }
                 updateActionMenu();
             } else {
@@ -612,6 +614,8 @@ public class DirectoryFragment extends Fragment {
                 if (mActionMode != null) {
                     mActionMode.finish();
                 }
+                getActivity().getWindow().setStatusBarColor(
+                    getResources().getColor(R.color.status_bar_background));
             }
 
             if (mActionMode != null) {