WidgetTray UI tweak

- set fixed image view width
- fade in when widget bitmap populates
- widget dimension is next to the widget name text.
- elevation of the widgets content and the reveal view is the same

b/19897708

Change-Id: Ia656144412e7d63a491ce67ff15fb58c05d9a9d9

6 files changed, 17 insertions, 18 deletions

diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml
index a5b25aadb..f53b74ef8 100644
--- a/res/layout/widget_cell.xml
+++ b/res/layout/widget_cell.xml
@@ -16,16 +16,16 @@
 <com.android.launcher3.widget.WidgetCell
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
-
-    android:layout_width="wrap_content"
+    android:layout_width="@dimen/widget_preview_container_width"
     android:layout_height="wrap_content"
     android:layout_weight="1"
+    android:paddingTop="@dimen/widget_preview_padding_top"
     android:orientation="vertical"
     android:background="@drawable/focusable_view_bg"
     android:focusable="true">
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/widget_preview_label_vertical_padding"
         android:paddingBottom="@dimen/widget_preview_label_vertical_padding"
@@ -64,6 +64,7 @@
 
             android:textColor="#FFFFFFFF"
             android:textSize="12sp"
+            android:textAlignment="viewStart"
             android:fontFamily="sans-serif-condensed"
             android:shadowRadius="2.0"
             android:shadowColor="#B0000000" />
@@ -73,12 +74,9 @@
     <com.android.launcher3.widget.WidgetImageView
         android:id="@+id/widget_preview"
         style="@style/WidgetImageView"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingTop="@dimen/widget_preview_padding_top"
-        android:paddingEnd="@dimen/widget_preview_padding_right"
-        android:paddingRight="@dimen/widget_preview_padding_right"
         android:scaleType="matrix" />
 
 </com.android.launcher3.widget.WidgetCell>
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index 8e7ed161a..0800f59aa 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -25,16 +25,16 @@
     android:paddingBottom="@dimen/widget_container_inset"
     android:descendantFocusability="afterDescendants">
 
-    <!-- Temporary until finalizing on animation.  -->
-    <include
+    <FrameLayout
         android:id="@+id/widgets_reveal_view"
-        layout="@layout/apps_reveal_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:visibility="invisible"
+        android:focusable="false" />
 
     <LinearLayout
-        android:id="@+id/content"
+        android:id="@+id/widgets_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipChildren="false"
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 13a1f4098..9ecd07dd1 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -25,8 +25,8 @@
 
 <!-- AppsCustomize -->
     <dimen name="widget_preview_label_margin_top">8dp</dimen>
-    <dimen name="widget_preview_label_margin_left">@dimen/widget_preview_padding_left</dimen>
-    <dimen name="widget_preview_label_margin_right">@dimen/widget_preview_padding_right</dimen>
+    <dimen name="widget_preview_label_margin_left">@dimen/widget_preview_label_horizontal_padding</dimen>
+    <dimen name="widget_preview_label_margin_right">@dimen/widget_preview_label_horizontal_padding</dimen>
 
 <!-- Cling -->
     <dimen name="cling_migration_logo_height">400dp</dimen>
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 229375f85..3589e80ac 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="WidgetImageView">
-        <item name="android:paddingStart">@dimen/widget_preview_padding_left</item>
+        <item name="android:paddingStart">@dimen/widget_preview_horizontal_padding</item>
     </style>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 101b7558a..cad60fbae 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -81,15 +81,16 @@
 <!-- Widget tray -->
     <dimen name="widget_container_inset">8dp</dimen>
     <dimen name="widget_preview_size">140dp</dimen>
-    <dimen name="widget_preview_padding_left">16dp</dimen>
-    <dimen name="widget_preview_padding_right">16dp</dimen>
     <dimen name="widget_preview_padding_top">8dp</dimen>
     <dimen name="widget_preview_label_vertical_padding">8dp</dimen>
     <dimen name="widget_preview_label_horizontal_padding">8dp</dimen>
+    <dimen name="widget_preview_horizontal_padding">8dp</dimen>
 
     <dimen name="widget_section_height">52dp</dimen>
     <dimen name="widget_section_icon_padding">8dp</dimen>
 
+    <!-- Equation: widget_preview_size + 2 * widget_preview_padding_horizontal -->
+    <dimen name="widget_preview_container_width">156dp</dimen>
     <dimen name="widget_cell_height">160dp</dimen>
 
     <!-- Padding applied to shortcut previews -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 94efebc06..16d4cbeed 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -92,7 +92,7 @@
 
     <!-- Overridden in device overlays -->
     <style name="WidgetImageView">
-        <item name="android:paddingLeft">@dimen/widget_preview_padding_left</item>
+        <item name="android:paddingLeft">@dimen/widget_preview_horizontal_padding</item>
     </style>
 
 </resources>