commit cc2b210ff8d4aefc890c016e4d352f069a5d3eef
author Svetoslav <svetoslavganov@google.com> Wed Jul 16 00:35:01 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 16 02:18:09 2014 +0000
tree 01ac882aa42aca034b2d9ef585fa2e80c176da95
parent 53b9e2a7527ccf634f4b2c5a8453d8bc44b3258d
parent 4bcc4a042c760a776ef52a0f727331db3fa315d2

Merge "Update the promoted action background color per UX spec" into lmp-dev

packages/PrintSpooler/res/values/colors.xml

diff --git a/packages/PrintSpooler/res/values/colors.xml b/packages/PrintSpooler/res/values/colors.xml
index 8fa147f..de74a41 100644
--- a/packages/PrintSpooler/res/values/colors.xml
+++ b/packages/PrintSpooler/res/values/colors.xml
@@ -22,6 +22,6 @@
 
     <color name="print_preview_background_color">#F2F1F2</color>
 
-    <color name="promoted_action_background_color">#FF00E5FF</color>
+    <color name="promoted_action_background_color">#FF80CBC4</color>
 
 </resources>

packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java

diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
index 10b8b02..30808ba 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
@@ -334,22 +334,22 @@
         content.init(provider, mMediaSize, mMinMargins);
 
 
-        View selector = page.findViewById(R.id.page_selector);
-        selector.setTag(myHolder);
+        View pageSelector = page.findViewById(R.id.page_selector);
+        pageSelector.setTag(myHolder);
         if (pageCount > 1) {
-            selector.setOnClickListener(mPageClickListener);
-            selector.setVisibility(View.VISIBLE);
+            pageSelector.setOnClickListener(mPageClickListener);
+            pageSelector.setVisibility(View.VISIBLE);
         } else {
-            selector.setOnClickListener(null);
-            selector.setVisibility(View.GONE);
+            pageSelector.setOnClickListener(null);
+            pageSelector.setVisibility(View.GONE);
         }
 
         if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) >= 0) {
-            selector.setSelected(true);
+            pageSelector.setSelected(true);
             page.setTranslationZ(mSelectedPageElevation);
             page.setAlpha(mSelectedPageAlpha);
         } else {
-            selector.setSelected(false);
+            pageSelector.setSelected(false);
             page.setTranslationZ(mUnselectedPageElevation);
             page.setAlpha(mUnselectedPageAlpha);
         }