Drop of the final UX assets for printing.

bug:15705610

Change-Id: I82104a2c0b3d1f4e34f71357b10bed24c0583e71

35 files changed, 60 insertions, 21 deletions

diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-hdpi/ic_check_circle.png
new file mode 100644
index 0000000..4ad5417
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-hdpi/ic_check_circle.png
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less.png
new file mode 100644
index 0000000..b6a5eb5
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less.png
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less_24dp.png
deleted file mode 100644
index d2e5408..0000000
--- a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_less_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more.png
new file mode 100644
index 0000000..4e36bd2
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more.png
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more_24dp.png
deleted file mode 100644
index f4c4b0c..0000000
--- a/packages/PrintSpooler/res/drawable-hdpi/ic_expand_more_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-hdpi/ic_remove_circle.png
new file mode 100644
index 0000000..ef053b6
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-hdpi/ic_remove_circle.png
diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-mdpi/ic_check_circle.png
new file mode 100644
index 0000000..f66065a
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-mdpi/ic_check_circle.png
diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less.png
new file mode 100644
index 0000000..428a946
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_less.png
diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more.png
new file mode 100644
index 0000000..fbbd094
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-mdpi/ic_expand_more.png
diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-mdpi/ic_remove_circle.png
new file mode 100644
index 0000000..7e044ac
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-mdpi/ic_remove_circle.png
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_check_circle.png
new file mode 100644
index 0000000..d8ea4d2
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_check_circle.png
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less.png
new file mode 100644
index 0000000..6161c20
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less.png
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less_24dp.png
deleted file mode 100644
index f007427..0000000
--- a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_less_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more.png
new file mode 100644
index 0000000..3a89805
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more.png
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more_24dp.png
deleted file mode 100644
index 43debb3..0000000
--- a/packages/PrintSpooler/res/drawable-xhdpi/ic_expand_more_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_remove_circle.png
new file mode 100644
index 0000000..622989c
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_remove_circle.png
diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_check_circle.png
new file mode 100644
index 0000000..ac36eba
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxhdpi/ic_check_circle.png
diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less.png
new file mode 100644
index 0000000..52a52d9
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less.png
diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less_24dp.png
deleted file mode 100644
index 39bc2ba..0000000
--- a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_less_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more.png
new file mode 100644
index 0000000..15e6abd
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more.png
diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more_24dp.png
deleted file mode 100644
index 664f3f2..0000000
--- a/packages/PrintSpooler/res/drawable-xxhdpi/ic_expand_more_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-xxhdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-xxhdpi/ic_remove_circle.png
new file mode 100644
index 0000000..303ccfb
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxhdpi/ic_remove_circle.png
diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_check_circle.png
new file mode 100644
index 0000000..1737f0a
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_check_circle.png
diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less.png
new file mode 100644
index 0000000..46811a1
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less.png
diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less_24dp.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less_24dp.png
deleted file mode 100644
index fe9c539..0000000
--- a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_less_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more.png
new file mode 100644
index 0000000..141f28b
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more.png
diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more_24dp.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more_24dp.png
deleted file mode 100644
index 18d075c..0000000
--- a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_expand_more_24dp.png
+++ /dev/null
diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_remove_circle.png
new file mode 100644
index 0000000..e9c6252
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_remove_circle.png
diff --git a/packages/PrintSpooler/res/drawable/ic_expand_less.xml b/packages/PrintSpooler/res/drawable/ic_expand_less.xml
index b0c7d51..6f1ece1 100644
--- a/packages/PrintSpooler/res/drawable/ic_expand_less.xml
+++ b/packages/PrintSpooler/res/drawable/ic_expand_less.xml
@@ -20,7 +20,7 @@
     <item
         android:state_checked="true">
         <bitmap
-            android:src="@drawable/ic_expand_less_24dp"
+            android:src="@drawable/ic_expand_less"
             android:tint="?android:attr/colorControlActivated">
         </bitmap>
     </item>
@@ -28,14 +28,14 @@
     <item
         android:state_pressed="true">
         <bitmap
-            android:src="@drawable/ic_expand_less_24dp"
+            android:src="@drawable/ic_expand_less"
             android:tint="?android:attr/colorControlActivated">
         </bitmap>
     </item>
 
     <item>
         <bitmap
-            android:src="@drawable/ic_expand_less_24dp"
+            android:src="@drawable/ic_expand_less"
             android:tint="?android:attr/colorControlNormal">
         </bitmap>
     </item>
diff --git a/packages/PrintSpooler/res/drawable/ic_expand_more.xml b/packages/PrintSpooler/res/drawable/ic_expand_more.xml
index b809c25..8d71452 100644
--- a/packages/PrintSpooler/res/drawable/ic_expand_more.xml
+++ b/packages/PrintSpooler/res/drawable/ic_expand_more.xml
@@ -20,7 +20,7 @@
     <item
         android:state_checked="true">
         <bitmap
-            android:src="@drawable/ic_expand_more_24dp"
+            android:src="@drawable/ic_expand_more"
             android:tint="?android:attr/colorControlActivated">
         </bitmap>
     </item>
@@ -28,14 +28,14 @@
     <item
         android:state_pressed="true">
         <bitmap
-            android:src="@drawable/ic_expand_more_24dp"
+            android:src="@drawable/ic_expand_more"
             android:tint="?android:attr/colorControlActivated">
         </bitmap>
     </item>
 
     <item>
         <bitmap
-            android:src="@drawable/ic_expand_more_24dp"
+            android:src="@drawable/ic_expand_more"
             android:tint="?android:attr/colorControlNormal">
         </bitmap>
     </item>
diff --git a/packages/PrintSpooler/res/drawable/page_selector_background.xml b/packages/PrintSpooler/res/drawable/page_selector_background.xml
new file mode 100644
index 0000000..7f1da31
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable/page_selector_background.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:enterFadeDuration="@android:integer/config_shortAnimTime"
+    android:exitFadeDuration="@android:integer/config_shortAnimTime">
+
+    <item
+        android:state_selected="true">
+        <bitmap
+            android:src="@drawable/ic_check_circle"
+            android:tint="@color/promoted_action_background_color">
+        </bitmap>
+    </item>
+
+    <item>
+        <bitmap
+            android:src="@drawable/ic_remove_circle"
+            android:tint="@color/promoted_action_background_color">
+        </bitmap>
+    </item>
+
+</selector>
diff --git a/packages/PrintSpooler/res/drawable/print_button_background.xml b/packages/PrintSpooler/res/drawable/print_button_background.xml
index 7b9aea5..aec8474 100644
--- a/packages/PrintSpooler/res/drawable/print_button_background.xml
+++ b/packages/PrintSpooler/res/drawable/print_button_background.xml
@@ -18,7 +18,7 @@
     android:shape="oval">
 
     <solid
-        android:color="#FF00E5FF">
+        android:color="@color/promoted_action_background_color">
     </solid>
 
     <size
diff --git a/packages/PrintSpooler/res/layout/preview_page.xml b/packages/PrintSpooler/res/layout/preview_page.xml
index bd56371..509a1d2 100644
--- a/packages/PrintSpooler/res/layout/preview_page.xml
+++ b/packages/PrintSpooler/res/layout/preview_page.xml
@@ -44,14 +44,15 @@
             android:textColor="?android:attr/textColorPrimary">
         </TextView>
 
-        <CheckBox
+        <ImageView
             android:id="@+id/page_selector"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="8dip"
             android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true">
-        </CheckBox>
+            android:layout_centerVertical="true"
+            android:background="@drawable/page_selector_background">
+        </ImageView>
 
     </RelativeLayout>
 
diff --git a/packages/PrintSpooler/res/values/colors.xml b/packages/PrintSpooler/res/values/colors.xml
index 677fda7..8fa147f 100644
--- a/packages/PrintSpooler/res/values/colors.xml
+++ b/packages/PrintSpooler/res/values/colors.xml
@@ -22,4 +22,6 @@
 
     <color name="print_preview_background_color">#F2F1F2</color>
 
+    <color name="promoted_action_background_color">#FF00E5FF</color>
+
 </resources>
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
index eaf268d..438ef2a 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 @@ public final class PageAdapter extends Adapter {
         content.init(provider, mMediaSize, mMinMargins);
 
 
-        CheckBox checkbox = (CheckBox) page.findViewById(R.id.page_selector);
-        checkbox.setTag(myHolder);
+        View selector = page.findViewById(R.id.page_selector);
+        selector.setTag(myHolder);
         if (pageCount > 1) {
-            checkbox.setOnClickListener(mPageClickListener);
-            checkbox.setVisibility(View.VISIBLE);
+            selector.setOnClickListener(mPageClickListener);
+            selector.setVisibility(View.VISIBLE);
         } else {
-            checkbox.setOnClickListener(null);
-            checkbox.setVisibility(View.GONE);
+            selector.setOnClickListener(null);
+            selector.setVisibility(View.GONE);
         }
 
         if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) >= 0) {
-            checkbox.setChecked(true);
+            selector.setSelected(true);
             page.setTranslationZ(mSelectedPageElevation);
             page.setAlpha(mSelectedPageAlpha);
         } else {
-            checkbox.setChecked(false);
+            selector.setSelected(false);
             page.setTranslationZ(mUnselectedPageElevation);
             page.setAlpha(mUnselectedPageAlpha);
         }
@@ -766,15 +766,15 @@ public final class PageAdapter extends Adapter {
             MyViewHolder holder = (MyViewHolder) page.getTag();
             final int pageInAdapter = holder.mPageInAdapter;
             final int pageInDocument = computePageIndexInDocument(pageInAdapter);
-            CheckBox pageSelector = (CheckBox) page.findViewById(R.id.page_selector);
+            View pageSelector = page.findViewById(R.id.page_selector);
             if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) < 0) {
                 mConfirmedPagesInDocument.put(pageInDocument, null);
-                pageSelector.setChecked(true);
+                pageSelector.setSelected(true);
                 page.animate().translationZ(mSelectedPageElevation)
                         .alpha(mSelectedPageAlpha);
             } else {
                 mConfirmedPagesInDocument.remove(pageInDocument);
-                pageSelector.setChecked(false);
+                pageSelector.setSelected(false);
                 page.animate().translationZ(mUnselectedPageElevation)
                         .alpha(mUnselectedPageAlpha);
             }