Update the static wallpaper Preview screen

Update Image wallpaper preview screen and 
IndividualPickerActivity to match the latest specs
(see spec in bug)

Bug: 132641260

Change-Id: Icee6db33ef6c4966367f39e1d8b7c1a2a745ec31

15 files changed, 256 insertions, 111 deletions

diff --git a/res/drawable/btn_transparent.xml b/res/drawable/btn_transparent.xml
new file mode 100644
index 0000000..b8e0d1e
--- /dev/null
+++ b/res/drawable/btn_transparent.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+     Copyright (C) 2019 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.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/btn_transparent_background"
+    android:insetBottom="5dp"
+    android:insetTop="5dp"/>
\ No newline at end of file
diff --git a/res/drawable/btn_transparent_background.xml b/res/drawable/btn_transparent_background.xml
new file mode 100644
index 0000000..9eb3bfc
--- /dev/null
+++ b/res/drawable/btn_transparent_background.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+     Copyright (C) 2019 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="@android:color/white"/>
+            <corners android:radius="?android:attr/buttonCornerRadius"/>
+        </shape>
+    </item>
+    <item android:drawable="?selectableItemBackground"/>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/preview_bottom_sheet_background.xml b/res/drawable/preview_bottom_sheet_background.xml
new file mode 100644
index 0000000..847cbf3
--- /dev/null
+++ b/res/drawable/preview_bottom_sheet_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+     Copyright (C) 2019 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+    <solid android:color="@color/translucent_black"/>
+    <corners android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" android:topLeftRadius="@dimen/preview_bottom_sheet_corner_radius" android:topRightRadius="@dimen/preview_bottom_sheet_corner_radius"/>
+</shape>
\ No newline at end of file
diff --git a/res/layout/fragment_preview.xml b/res/layout/fragment_preview.xml
index a861213..82c481f 100755
--- a/res/layout/fragment_preview.xml
+++ b/res/layout/fragment_preview.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:fitsSystemWindows="false">
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:fitsSystemWindows="false">
 
   <ImageView
     android:id="@+id/low_res_image"
@@ -30,107 +31,19 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-      <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto"
+      <androidx.coordinatorlayout.widget.CoordinatorLayout
           android:id="@+id/coordinator_layout"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_gravity="bottom">
 
-      <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/bottom_sheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:minHeight="@dimen/preview_attribution_pane_expanded_height"
-        android:orientation="vertical"
-        android:background="@color/translucent_black"
-        app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-        <LinearLayout
-          android:orientation="vertical"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="@dimen/preview_attribution_pane_content_side_margin"
-          android:layout_marginRight="@dimen/preview_attribution_pane_content_side_margin"
-          android:layout_marginBottom="@dimen/preview_attribution_pane_content_bottom_margin">
-
-          <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-              android:id="@+id/preview_attribution_pane_title"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_gravity="top|start"
-              android:layout_marginRight="@dimen/preview_attribution_pane_title_end_margin"
-              android:layout_marginEnd="@dimen/preview_attribution_pane_title_end_margin"
-              android:layout_marginTop="@dimen/preview_attribution_pane_title_top_margin"
-              style="@style/preview_attribution_pane_title"/>
-
-            <ImageView
-              android:id="@+id/preview_attribution_pane_arrow"
-              android:contentDescription="@string/expand_attribution_panel"
-              android:layout_gravity="top|end"
-              android:layout_width="@dimen/preview_attribution_pane_arrow_size"
-              android:layout_height="@dimen/preview_attribution_pane_arrow_size"
-              android:layout_marginLeft="@dimen/preview_attribution_pane_arrow_start_margin"
-              android:layout_marginStart="@dimen/preview_attribution_pane_arrow_start_margin"
-              android:layout_marginTop="@dimen/preview_attribution_pane_arrow_top_bottom_margin"
-              android:layout_marginBottom="@dimen/preview_attribution_pane_arrow_top_bottom_margin"
-              android:scaleType="center"
-              android:focusable="true"
-              android:clickable="true"
-              android:src="@drawable/material_ic_keyboard_arrow_up_black_24"
-              style="?attr/borderlessButtonStyle"/>
-
-          </FrameLayout>
-
-          <TextView
-            android:id="@+id/preview_attribution_pane_subtitle1"
+        <include
+            layout="@layout/preview_page_info"
+            android:id="@+id/bottom_sheet"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/preview_attribution_pane_subtitle1_top_margin"
-            android:visibility="gone"
-            style="@style/preview_attribution_pane_subtitle"/>
-
-          <TextView
-            android:id="@+id/preview_attribution_pane_subtitle2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:textColor="@color/white_70_alpha"
-            android:textSize="@dimen/abc_text_size_caption_material"
-            android:layout_marginTop="@dimen/preview_attribution_pane_subtitle2_top_margin"/>
-
-        </LinearLayout>
-
-        <FrameLayout
-          android:id="@+id/preview_attribution_pane_explore_section"
-          android:layout_width="match_parent"
-          android:layout_height="@dimen/preview_attribution_pane_explore_height"
-          android:layout_marginBottom="@dimen/preview_attribution_pane_explore_bottom_margin"
-          android:visibility="gone">
-
-          <Button
-            android:id="@+id/preview_attribution_pane_explore_button"
-            android:drawablePadding="@dimen/explore_button_drawable_padding"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/accent_color"
-            android:text="@string/explore"
-            android:layout_marginLeft="@dimen/preview_attribution_pane_explore_left_margin"
-            android:layout_marginStart="@dimen/preview_attribution_pane_explore_left_margin"
-            android:layout_gravity="center_vertical"
-            style="?attr/borderlessButtonStyle"/>
-
-        </FrameLayout>
-
-      </LinearLayout>
+            app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height"
+            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"/>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/res/layout/preview_action.xml b/res/layout/preview_action.xml
new file mode 100644
index 0000000..9f5cc6d
--- /dev/null
+++ b/res/layout/preview_action.xml
@@ -0,0 +1,25 @@
+<!-- Copyright (C) 2019 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.
+-->
+
+<CheckBox
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/ActionBarCheckboxStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:background="?android:attr/selectableItemBackgroundBorderless"
+    android:text="@string/preview"
+    android:textAllCaps="false"
+    android:textAppearance="?android:attr/actionMenuTextAppearance"
+    android:theme="@style/PreviewCheckboxDeviceTheme"/>
\ No newline at end of file
diff --git a/res/layout/preview_page_info.xml b/res/layout/preview_page_info.xml
new file mode 100644
index 0000000..587e120
--- /dev/null
+++ b/res/layout/preview_page_info.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+     Copyright (C) 2019 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/page_info"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:paddingHorizontal="@dimen/preview_attribution_pane_horizontal_padding"
+    android:background="@drawable/preview_bottom_sheet_background"
+    android:theme="@android:style/Theme.DeviceDefault.Settings">
+
+    <Space
+        android:id="@+id/preview_attribution_pane_title_spacer"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/preview_attribution_pane_inner_spacer_height"/>
+
+    <TextView
+        android:id="@+id/preview_attribution_pane_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/preview_attribution_pane_title_height"
+        android:ellipsize="end"
+        android:forceHasOverlappingRendering="false"
+        android:gravity="center"
+        android:singleLine="true"
+        android:textAppearance="@style/HeaderTextAppearance"
+        android:textColor="@color/material_white_100"/>
+
+    <TextView
+        android:id="@+id/preview_attribution_pane_subtitle1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/preview_attribution_pane_author_height"
+        android:layout_marginTop="@dimen/preview_attribution_pane_author_top_margin"
+        android:forceHasOverlappingRendering="false"
+        android:gravity="center"
+        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
+        android:textColor="@color/material_white_100"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/preview_attribution_pane_subtitle2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/preview_attribution_pane_description_height"
+        android:forceHasOverlappingRendering="false"
+        android:gravity="center_horizontal"
+        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption"
+        android:textColor="@color/material_white_100"
+        android:visibility="gone"/>
+
+    <Space
+        android:id="@+id/preview_attribution_pane_spacer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/preview_attribution_pane_inner_spacer_height"
+        android:layout_weight="1"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/preview_attribution_pane_button_bottom_margin"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <Button
+            style="@style/OutlinedButtonStyle"
+            android:id="@+id/preview_attribution_pane_explore_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/explore"
+            android:visibility="gone"/>
+
+        <Space
+            android:id="@+id/spacer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:visibility="gone"/>
+
+        <Button
+            style="@style/ButtonStyle"
+            android:id="@+id/preview_attribution_pane_set_wallpaper_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/set_wallpaper_button_text"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/preview_menu.xml b/res/menu/preview_menu.xml
index d35a16d..7c9d610 100755
--- a/res/menu/preview_menu.xml
+++ b/res/menu/preview_menu.xml
@@ -15,9 +15,9 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/set_wallpaper"
-        android:actionLayout="@layout/set_wallpaper_action"
-        android:title="@string/set_wallpaper_button_text"
-        app:showAsAction="always|withText" />
+    <item android:id="@+id/preview"
+          android:checkable="true"
+          app:actionLayout="@layout/preview_action"
+          app:showAsAction="always|withText"
+          android:title="@string/preview"/>
 </menu>
diff --git a/res/values-notnight-v26/picker_colors.xml b/res/values-notnight-v26/picker_colors.xml
index c8c8424..a21500f 100755
--- a/res/values-notnight-v26/picker_colors.xml
+++ b/res/values-notnight-v26/picker_colors.xml
@@ -50,4 +50,6 @@
     <color name="individual_tile_title_text_color">@color/textColorPrimary</color>
 
     <color name="individual_picker_background_color">@color/material_white_100</color>
+
+    <color name="toolbar_icon_color">@color/text_color_dark</color>
 </resources>
diff --git a/res/values-notnight-v26/styles.xml b/res/values-notnight-v26/styles.xml
index ae7f7dd..3ca6dcf 100755
--- a/res/values-notnight-v26/styles.xml
+++ b/res/values-notnight-v26/styles.xml
@@ -22,9 +22,7 @@
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="RegularToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/primary_color</item>
+    <style name="RegularToolbarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
         <item name="android:theme">@style/WallpaperTheme</item>
-        <item name="titleTextColor">@color/accent_color</item>
     </style>
 </resources>
diff --git a/res/values-notnight-v27/styles.xml b/res/values-notnight-v27/styles.xml
index 7c104f7..4de0e9f 100755
--- a/res/values-notnight-v27/styles.xml
+++ b/res/values-notnight-v27/styles.xml
@@ -17,7 +17,7 @@
 
     <style name="WallpaperTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="colorControlActivated">?attr/colorPrimary</item>
-        <item name="colorControlNormal">?attr/colorAccent</item>
+        <item name="colorControlNormal">?android:attr/colorPrimary</item>
         <item name="android:statusBarColor">?attr/colorPrimary</item>
         <item name="android:windowLightStatusBar">true</item>
 
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 3289d1b..ece1ff7 100755
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -38,8 +38,7 @@
 
     <!-- Dimensions for the preview attribution pane. -->
 
-    <!-- 48dp + 2 * 8dp margin -->
-    <dimen name="preview_attribution_pane_collapsed_height">64dp</dimen>
+    <dimen name="preview_attribution_pane_collapsed_height">0dp</dimen>
 
     <dimen name="preview_attribution_pane_content_side_margin">24dp</dimen>
     <dimen name="preview_attribution_pane_explore_left_margin">10dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d7a149b..5c7a4a9 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -102,8 +102,7 @@
     <dimen name="preview_toolbar_up_button_start_padding">0dp</dimen>
     <dimen name="preview_toolbar_set_wallpaper_button_end_padding">12dp</dimen>
 
-    <!-- 48dp + 2 * 1dp margin -->
-    <dimen name="preview_attribution_pane_collapsed_height">50dp</dimen>
+    <dimen name="preview_attribution_pane_collapsed_height">0dp</dimen>
 
     <dimen name="preview_attribution_pane_expanded_height">96dp</dimen>
     <dimen name="preview_attribution_pane_content_side_margin">16dp</dimen>
@@ -118,6 +117,15 @@
     <dimen name="preview_attribution_pane_explore_height">48dp</dimen>
     <dimen name="preview_attribution_pane_explore_left_margin">2dp</dimen>
     <dimen name="preview_attribution_pane_explore_bottom_margin">16dp</dimen>
+    <dimen name="preview_attribution_pane_horizontal_padding">24dp</dimen>
+    <dimen name="preview_attribution_pane_extra_spacer_height">16dp</dimen>
+    <dimen name="preview_attribution_pane_inner_spacer_height">14dp</dimen>
+    <dimen name="preview_attribution_pane_title_height">48dp</dimen>
+    <dimen name="preview_attribution_pane_author_height">24dp</dimen>
+    <dimen name="preview_attribution_pane_author_top_margin">0dp</dimen>
+    <dimen name="preview_attribution_pane_description_height">34dp</dimen>
+    <dimen name="preview_attribution_pane_button_bottom_margin">8dp</dimen>
+
 
     <!-- Dimensions for the "start rotation" dialog. -->
     <dimen name="start_rotation_dialog_subhead_margin_top">19dp</dimen>
@@ -168,5 +176,6 @@
 
     <!-- Dimensions for the "disabled by admin" UI in desktop mode. -->
     <dimen name="disabled_by_admin_desktop_message_text_size">13sp</dimen>
+    <dimen name="preview_bottom_sheet_corner_radius">?android:attr/dialogCornerRadius</dimen>
 
 </resources>
diff --git a/res/values/picker_colors.xml b/res/values/picker_colors.xml
index f6c85c5..3f6b6af 100755
--- a/res/values/picker_colors.xml
+++ b/res/values/picker_colors.xml
@@ -70,4 +70,6 @@
     <color name="individual_picker_background_color">@color/translucent_black</color>
 
     <color name="preview_pane_arrow_color">@color/material_white_100</color>
+
+    <color name="toolbar_icon_color">@color/material_white_text</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 83bea72..fe99050 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -297,4 +297,7 @@
     <string name="third_party_app_wallpaper_collection_id" translatable="false">
       third_party_app_wallpapers
     </string>
+
+    <!-- Label for a checkbox which lets user preview the displayed image as wallpaper. [CHAR LIMIT=30] -->
+    <string name="preview">Preview</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0c66ab1..511f0fb 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -27,6 +27,8 @@
         <!-- Set no title and no action bar because we use a toolbar instead. -->
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
 
         <!-- Set status bar and navigation buttons to be translucent. -->
         <item name="android:colorPrimaryDark">@color/translucent_black</item>
@@ -42,7 +44,7 @@
     </style>
 
     <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/translucent_black</item>
+        <item name="android:background">@android:color/transparent</item>
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     </style>
 
@@ -106,4 +108,21 @@
     <style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
         <item name="android:textFontWeight">400</item>
     </style>
+
+    <style name="ButtonStyle" parent="@android:style/Widget.DeviceDefault.Button.Colored">
+        <item name="android:padding">16dp</item>
+        <item name="android:minHeight">48dp</item>
+    </style>
+
+    <style name="OutlinedButtonStyle"  parent="@android:style/Widget.DeviceDefault.Button">
+        <item name="android:background">@drawable/btn_transparent</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <style name="ActionBarCheckboxStyle" parent="@android:style/Widget.DeviceDefault.CompoundButton.CheckBox"/>
+
+    <style name="PreviewCheckboxDeviceTheme" parent="@android:style/Theme.DeviceDefault">
+        <item name="android:colorControlActivated">@*android:color/accent_device_default_light</item>
+    </style>
 </resources>