Print UI polish based on UX feedback.

1. Refreshed the print UI based on UX redlines.

2. Implemented tap outside cancel for the print job config activity
   which is full-screen but pretends to be a dialog.

Change-Id: I5afc7cd40c696109d70af31536898cfcad91b2ab

4 files changed, 100 insertions, 136 deletions

diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_container.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_container.xml
index e36b8b5..a0c111b 100644
--- a/packages/PrintSpooler/res/layout/print_job_config_activity_container.xml
+++ b/packages/PrintSpooler/res/layout/print_job_config_activity_container.xml
@@ -19,7 +19,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:background="@color/print_job_config_activity_content_background">
+    android:background="@color/container_background">
 
     <include
         layout="@layout/print_job_config_activity_content_editing">
diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml
index 77ef5a2..84c41de 100644
--- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml
+++ b/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml
@@ -18,19 +18,22 @@
     android:id="@+id/content_editing"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:divider="?android:attr/dividerHorizontal"
-    android:showDividers="middle">
+    android:orientation="vertical">
 
     <ScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:scrollbars="vertical">
+        android:scrollbars="vertical"
+        android:background="@color/editable_background">
 
         <GridLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="24dip"
+            android:layout_marginTop="32dip"
+            android:layout_marginEnd="24dip"
+            android:layout_marginBottom="24dip"
             android:orientation="vertical"
             android:columnCount="2">
 
@@ -41,14 +44,10 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="fill_horizontal"
-                android:layout_marginLeft="32dip"
-                android:layout_marginTop="32dip"
-                android:layout_marginRight="32dip"
-                android:layout_marginBottom="12dip"
                 android:layout_row="0"
                 android:layout_column="0"
                 android:layout_columnSpan="2"
-                android:minHeight="?android:attr/listPreferredItemHeight">
+                android:minHeight="?android:attr/listPreferredItemHeightSmall">
             </Spinner>
 
             <!-- Copies -->
@@ -58,31 +57,28 @@
                 android:id="@+id/copies_edittext"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dip"
-                android:layout_marginRight="12dip"
-                android:layout_marginBottom="12dip"
+                android:layout_marginEnd="6dip"
                 android:layout_row="2"
                 android:layout_column="0"
                 android:layout_gravity="bottom"
                 android:inputType="numberDecimal"
                 android:selectAllOnFocus="true"
                 android:minWidth="150dip"
-                android:minHeight="?android:attr/listPreferredItemHeight">
+                android:minHeight="?android:attr/listPreferredItemHeightSmall">
             </view>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dip"
                 android:layout_marginTop="12dip"
-                android:layout_marginRight="12dip"
+                android:layout_marginStart="12dip"
+                android:layout_marginEnd="6dip"
                 android:layout_row="1"
                 android:layout_column="0"
-                android:layout_gravity="left|bottom"
+                android:layout_gravity="start|bottom"
+                android:labelFor="@id/copies_edittext"
                 android:text="@string/label_copies"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textStyle="bold"
-                android:labelFor="@id/copies_edittext">
+                android:textAppearance="@style/PrintOptionTitleTextAppearance">
             </TextView>
 
             <!-- Paper size -->
@@ -91,27 +87,22 @@
                 android:id="@+id/paper_size_spinner"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_marginRight="32dip"
-                android:layout_marginBottom="12dip"
+                android:layout_marginStart="6dip"
                 android:layout_row="2"
                 android:layout_column="1"
-                android:minWidth="150dip"
-                android:minHeight="?android:attr/listPreferredItemHeight">
+                style="@style/PrintOptionSpinnerStyle">
             </Spinner>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_marginRight="32dip"
                 android:layout_marginTop="12dip"
+                android:layout_marginStart="18dip"
                 android:layout_row="1"
                 android:layout_column="1"
+                android:labelFor="@id/paper_size_spinner"
                 android:text="@string/label_paper_size"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textStyle="bold"
-                android:labelFor="@id/paper_size_spinner">
+                android:textAppearance="@style/PrintOptionTitleTextAppearance">
             </TextView>
 
             <!-- Color -->
@@ -120,27 +111,23 @@
                 android:id="@+id/color_spinner"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dip"
-                android:layout_marginRight="12dip"
-                android:layout_marginBottom="12dip"
+                android:layout_marginEnd="6dip"
                 android:layout_row="4"
                 android:layout_column="0"
-                android:minWidth="150dip"
-                android:minHeight="?android:attr/listPreferredItemHeight">
+                style="@style/PrintOptionSpinnerStyle">
             </Spinner>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dip"
                 android:layout_marginTop="12dip"
-                android:layout_marginRight="12dip"
+                android:layout_marginStart="12dip"
+                android:layout_marginEnd="6dip"
                 android:layout_row="3"
                 android:layout_column="0"
+                android:labelFor="@id/color_spinner"
                 android:text="@string/label_color"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textStyle="bold"
-                android:labelFor="@id/color_spinner">
+                android:textAppearance="@style/PrintOptionTitleTextAppearance">
             </TextView>
 
             <!-- Orientation -->
@@ -149,27 +136,22 @@
                 android:id="@+id/orientation_spinner"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_marginRight="32dip"
-                android:layout_marginBottom="12dip"
+                android:layout_marginStart="6dip"
                 android:layout_row="4"
                 android:layout_column="1"
-                android:minWidth="150dip"
-                android:minHeight="?android:attr/listPreferredItemHeight">
+                style="@style/PrintOptionSpinnerStyle">
             </Spinner>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
                 android:layout_marginTop="12dip"
-                android:layout_marginRight="32dip"
+                android:layout_marginStart="18dip"
                 android:layout_row="3"
                 android:layout_column="1"
+                android:labelFor="@id/orientation_spinner"
                 android:text="@string/label_orientation"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textStyle="bold"
-                android:labelFor="@id/orientation_spinner">
+                android:textAppearance="@style/PrintOptionTitleTextAppearance">
             </TextView>
 
             <!-- Pages -->
@@ -178,12 +160,10 @@
                 android:id="@+id/range_options_spinner"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dip"
-                android:layout_marginRight="12dip"
+                android:layout_marginEnd="6dip"
                 android:layout_row="6"
                 android:layout_column="0"
-                android:minWidth="150dip"
-                android:minHeight="?android:attr/listPreferredItemHeight">
+                style="@style/PrintOptionSpinnerStyle">
             </Spinner>
 
             <view
@@ -191,8 +171,8 @@
                 android:id="@+id/page_range_edittext"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_marginRight="32dip"
+                android:layout_marginTop="12dip"
+                android:layout_marginStart="6dip"
                 android:layout_row="6"
                 android:layout_column="1"
                 android:layout_gravity="bottom"
@@ -201,81 +181,41 @@
                 android:hint="@string/pages_range_example"
                 android:inputType="textNoSuggestions"
                 android:visibility="gone"
-                android:minHeight="?android:attr/listPreferredItemHeight">
+                android:minHeight="?android:attr/listPreferredItemHeightSmall">
             </view>
 
             <TextView
                 android:id="@+id/page_range_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dip"
                 android:layout_marginTop="12dip"
-                android:layout_marginRight="12dip"
+                android:layout_marginStart="12dip"
                 android:layout_row="5"
                 android:layout_column="0"
+                android:labelFor="@id/range_options_spinner"
                 android:text="@string/label_pages"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textStyle="bold"
-                android:labelFor="@id/range_options_spinner">
+                android:textAppearance="@style/PrintOptionTitleTextAppearance">
             </TextView>
 
-            <!-- Print pereview  -->
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="fill_horizontal"
-                android:layout_marginLeft="32dip"
-                android:layout_marginTop="32dip"
-                android:layout_marginRight="32dip"
-                android:layout_row="7"
-                android:layout_column="0"
-                android:layout_columnSpan="2"
-                android:background="?android:attr/listDivider"
-                android:contentDescription="@null">
-            </ImageView>
-
-            <Button
-                android:id="@+id/print_preview_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="fill_horizontal"
-                android:layout_marginLeft="32dip"
-                android:layout_marginRight="32dip"
-                android:layout_row="8"
-                android:layout_column="0"
-                android:layout_columnSpan="2"
-                android:text="@string/print_preview"
-                android:gravity="left|center_vertical"
-                android:background="?android:attr/selectableItemBackground"
-                android:minHeight="?android:attr/listPreferredItemHeight">
-            </Button>
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="fill_horizontal"
-                android:layout_marginLeft="32dip"
-                android:layout_marginRight="32dip"
-                android:layout_marginBottom="32dip"
-                android:layout_row="9"
-                android:layout_column="0"
-                android:layout_columnSpan="2"
-                android:background="?android:attr/listDivider"
-                android:contentDescription="@null">
-            </ImageView>
-
         </GridLayout>
 
     </ScrollView>
 
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:background="@color/separator">
+    </View>
+
     <Button
         android:id="@+id/print_button"
+        style="?android:attr/buttonBarButtonStyle"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="fill_horizontal"
         android:text="@string/print_button"
-        style="?android:attr/buttonBarButtonStyle">
+        android:textSize="16sp"
+        android:textColor="@color/important_text">
     </Button>
 
 </LinearLayout>
diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_content_generating.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_content_generating.xml
index 6352afc..8bdb6c9 100644
--- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_generating.xml
+++ b/packages/PrintSpooler/res/layout/print_job_config_activity_content_generating.xml
@@ -18,35 +18,56 @@
     android:id="@+id/content_generating"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:divider="?android:attr/dividerHorizontal"
-    android:showDividers="middle">
+    android:orientation="vertical">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?android:attr/buttonBarButtonStyle"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textAlignment="viewStart"
-        android:text="@string/generating_print_job" >
-    </TextView>
-
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="32dip"
-        android:layout_gravity="center_horizontal"
-        style="?android:attr/progressBarStyleLarge">
-    </ProgressBar>
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/editable_background"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dip"
+            android:layout_marginEnd="16dip"
+            android:layout_gravity="center"
+            style="?android:attr/buttonBarButtonStyle"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:text="@string/generating_print_job"
+            android:textColor="@color/important_text"
+            android:textSize="16sp">
+        </TextView>
+
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dip"
+            android:layout_marginEnd="32dip"
+            android:layout_marginTop="16dip"
+            android:layout_marginBottom="32dip"
+            android:layout_gravity="center_horizontal"
+            style="?android:attr/progressBarStyleLarge">
+        </ProgressBar>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="@color/separator">
+        </View>
+
+    </LinearLayout>
 
     <Button
         android:id="@+id/cancel_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="fill_horizontal"
-        android:text="@string/cancel_button"
-        style="?android:attr/buttonBarButtonStyle">
+        style="?android:attr/buttonBarButtonStyle"
+        android:text="@string/cancel"
+        android:textSize="16sp"
+        android:textColor="@color/important_text">
     </Button>
 
 </LinearLayout>
diff --git a/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml b/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml
index 66c6724..002cc14 100644
--- a/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml
+++ b/packages/PrintSpooler/res/layout/spinner_dropdown_item.xml
@@ -17,11 +17,11 @@
 <LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="8dip"
-    android:paddingRight="8dip"
+    android:paddingStart="8dip"
+    android:paddingEnd="8dip"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:orientation="vertical"
-    android:gravity="center_vertical">
+    android:gravity="left|center_vertical">
 
     <TextView
         android:id="@+id/title"
@@ -30,7 +30,9 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:singleLine="true"
         android:ellipsize="end"
-        android:textIsSelectable="false">
+        android:textIsSelectable="false"
+        android:gravity="top|left"
+        android:textColor="@color/important_text">
     </TextView>
 
     <TextView
@@ -41,7 +43,8 @@
         android:singleLine="true"
         android:ellipsize="end"
         android:textIsSelectable="false"
-        android:visibility="gone">
+        android:visibility="gone"
+        android:textColor="@color/important_text">
 
     </TextView>