commit fe18c1b7b6805926bdd5ecef141abfbd80349816
author Ben Kwa <kenobi@google.com> Fri Sep 11 15:40:18 2015 -0700
committer Ben Kwa <kenobi@google.com> Tue Sep 15 10:55:22 2015 -0700
tree c7c689c170f799f8c1f9218a02ec40eedf869ba5
parent 0574b18a7a95b29fab3cdb9ced6e5b46e24030fe

Adjust theming for Files mode.

- Bring files mode in line with MD spec platform colors.
- Normalize selection highlight color in grid and table mode.
- Fix status bar and accent colors in portrait mode.

BUG=23797347
BUG=24012021

Change-Id: I3427939b39f3f39f5e04bd4d854166dd6b3881b1

src/com/android/documentsui/DirectoryFragment.java

diff --git a/src/com/android/documentsui/DirectoryFragment.java b/src/com/android/documentsui/DirectoryFragment.java
index 4ce404b..e351d3c 100644
--- a/src/com/android/documentsui/DirectoryFragment.java
+++ b/src/com/android/documentsui/DirectoryFragment.java
@@ -637,27 +637,25 @@
         @Override
         public void onSelectionChanged() {
             mModel.getSelection(mSelected);
+            TypedValue color = new TypedValue();
             if (mSelected.size() > 0) {
                 if (DEBUG) Log.d(TAG, "Maybe starting action mode.");
                 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));
                 }
+                getActivity().getTheme().resolveAttribute(
+                    R.attr.colorActionMode, color, true);
                 updateActionMenu();
             } else {
                 if (DEBUG) Log.d(TAG, "Finishing action mode.");
                 if (mActionMode != null) {
                     mActionMode.finish();
                 }
-                // Obtain the original status bar color from the theme, and restore it.
-                TypedValue color = new TypedValue();
                 getActivity().getTheme().resolveAttribute(
                     android.R.attr.colorPrimaryDark, color, true);
-                getActivity().getWindow().setStatusBarColor(color.data);
-
             }
+            getActivity().getWindow().setStatusBarColor(color.data);
 
             if (mActionMode != null) {
                 mActionMode.setTitle(TextUtils.formatSelectedCount(mSelected.size()));