From 4e243a2dad3700868035256af1882d7a4fee2385 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sun, 10 Aug 2014 18:30:55 -0700
Subject: Updating the widget tray

-> adding dark panel / associated visual updates
-> cleaning up the sizing / padding / to match all apps
-> fixing a couple things from previous CL
-> (removed Context#getDrawable() calls, L-only)

Change-Id: Ia65a6eb704b35f74e7305be9334c27971b22235a
---
 res/drawable-hdpi/quantum_panel.9.png        | Bin 557 -> 636 bytes
 res/drawable-hdpi/quantum_panel_dark.9.png   | Bin 0 -> 713 bytes
 res/drawable-mdpi/quantum_panel.9.png        | Bin 406 -> 438 bytes
 res/drawable-mdpi/quantum_panel_dark.9.png   | Bin 0 -> 494 bytes
 res/drawable-xhdpi/quantum_panel.9.png       | Bin 764 -> 908 bytes
 res/drawable-xhdpi/quantum_panel_dark.9.png  | Bin 0 -> 951 bytes
 res/drawable-xxhdpi/quantum_panel.9.png      | Bin 1073 -> 1380 bytes
 res/drawable-xxhdpi/quantum_panel_dark.9.png | Bin 0 -> 1425 bytes
 res/layout/apps_customize_widget.xml         |  51 +++++++++++++++++++--------
 res/values/attrs.xml                         |   5 ---
 res/values/colors.xml                        |   3 +-
 res/values/dimens.xml                        |   7 ++--
 12 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 res/drawable-hdpi/quantum_panel_dark.9.png
 create mode 100644 res/drawable-mdpi/quantum_panel_dark.9.png
 create mode 100644 res/drawable-xhdpi/quantum_panel_dark.9.png
 create mode 100644 res/drawable-xxhdpi/quantum_panel_dark.9.png

(limited to 'res')

diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png
index d86d7bc1d..a005e0baa 100644
Binary files a/res/drawable-hdpi/quantum_panel.9.png and b/res/drawable-hdpi/quantum_panel.9.png differ
diff --git a/res/drawable-hdpi/quantum_panel_dark.9.png b/res/drawable-hdpi/quantum_panel_dark.9.png
new file mode 100644
index 000000000..057efd157
Binary files /dev/null and b/res/drawable-hdpi/quantum_panel_dark.9.png differ
diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png
index 061c80adb..785f573ee 100644
Binary files a/res/drawable-mdpi/quantum_panel.9.png and b/res/drawable-mdpi/quantum_panel.9.png differ
diff --git a/res/drawable-mdpi/quantum_panel_dark.9.png b/res/drawable-mdpi/quantum_panel_dark.9.png
new file mode 100644
index 000000000..7837e4808
Binary files /dev/null and b/res/drawable-mdpi/quantum_panel_dark.9.png differ
diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png
index 8605cfd26..5726fd215 100644
Binary files a/res/drawable-xhdpi/quantum_panel.9.png and b/res/drawable-xhdpi/quantum_panel.9.png differ
diff --git a/res/drawable-xhdpi/quantum_panel_dark.9.png b/res/drawable-xhdpi/quantum_panel_dark.9.png
new file mode 100644
index 000000000..8944a8f98
Binary files /dev/null and b/res/drawable-xhdpi/quantum_panel_dark.9.png differ
diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png
index 9a1a79c7b..035cdc4ad 100644
Binary files a/res/drawable-xxhdpi/quantum_panel.9.png and b/res/drawable-xxhdpi/quantum_panel.9.png differ
diff --git a/res/drawable-xxhdpi/quantum_panel_dark.9.png b/res/drawable-xxhdpi/quantum_panel_dark.9.png
new file mode 100644
index 000000000..b74f1a65c
Binary files /dev/null and b/res/drawable-xxhdpi/quantum_panel_dark.9.png differ
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index 7c98b4a9b..e299b32b0 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -25,24 +25,45 @@
     android:background="@drawable/focusable_view_bg"
     android:focusable="true">
 
-    <!-- The preview of the widget or shortcut. -->
-    <com.android.launcher3.PagedViewWidgetImageView
-        android:id="@+id/widget_preview"
-        style="@style/PagedViewWidgetImageView"
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="@dimen/app_widget_preview_padding_top"
-        android:paddingEnd="@dimen/app_widget_preview_padding_right"
-        android:paddingRight="@dimen/app_widget_preview_padding_right"
-        android:scaleType="matrix"
-        android:background="@drawable/screenpanel" />
+        android:layout_weight="1">
+        <FrameLayout
+            android:id="@+id/left_border"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/widget_text_panel"
+            android:visibility="gone" />
+
+        <!-- The preview of the widget or shortcut. -->
+        <com.android.launcher3.PagedViewWidgetImageView
+            android:id="@+id/widget_preview"
+            style="@style/PagedViewWidgetImageView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:paddingTop="@dimen/app_widget_preview_padding_top"
+            android:paddingEnd="@dimen/app_widget_preview_padding_right"
+            android:paddingRight="@dimen/app_widget_preview_padding_right"
+            android:scaleType="matrix" />
+        <FrameLayout
+            android:id="@+id/right_border"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/widget_text_panel"
+            android:visibility="gone" />
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/app_widget_preview_label_margin_top"
-        android:layout_marginStart="@dimen/app_widget_preview_label_margin_left"
-        android:layout_marginEnd="@dimen/app_widget_preview_label_margin_right"
+        android:paddingTop="@dimen/app_widget_preview_label_vertical_padding"
+        android:paddingBottom="@dimen/app_widget_preview_label_vertical_padding"
+        android:paddingLeft="@dimen/app_widget_preview_label_horizontal_padding"
+        android:paddingRight="@dimen/app_widget_preview_label_horizontal_padding"
+        android:background="@color/widget_text_panel"
         android:orientation="horizontal">
         <!-- The name of the widget. -->
         <TextView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -56,7 +77,7 @@
             android:fadingEdge="horizontal"
 
             android:textColor="#FFFFFFFF"
-            android:textSize="13sp"
+            android:textSize="12sp"
             android:textAlignment="viewStart"
             android:fontFamily="sans-serif-condensed"
             android:shadowRadius="2.0"
@@ -73,7 +94,7 @@
             android:layout_weight="0"
             android:gravity="start"
 
-            android:textColor="#FFAAAAAA"
+            android:textColor="#FFFFFFFF"
             android:textSize="12sp"
             android:fontFamily="sans-serif-condensed"
             android:shadowRadius="2.0"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f3bfcec61..12fa3cd2b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -98,11 +98,6 @@
         <!-- A spacing override for the icons within a page -->
         <attr name="pageLayoutWidthGap" format="dimension" />
         <attr name="pageLayoutHeightGap" format="dimension" />
-        <!-- The padding of the pages that are dynamically created per page -->
-        <attr name="pageLayoutPaddingTop" format="dimension" />
-        <attr name="pageLayoutPaddingBottom" format="dimension" />
-        <attr name="pageLayoutPaddingLeft" format="dimension" />
-        <attr name="pageLayoutPaddingRight" format="dimension" />
 
         <!-- The page indicator for this workspace -->
         <attr name="pageIndicator" format="reference" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 27a5b61ee..41f38921f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,6 +36,7 @@
     <color name="quantum_panel_text_shadow_color">#FFC4C4C4</color>
     <color name="folder_items_glow_color">#FFCCCCCC</color>
     <color name="outline_color">#FFFFFFFF</color>
-    
+    <color name="widget_text_panel">#FF374248</color>
+
     <color name="first_run_cling_circle_background_color">#64b1ea</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8e561cfc0..893d7c0db 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -62,7 +62,7 @@
     <dimen name="apps_customize_tab_bar_height">52dp</dimen>
     <dimen name="apps_customize_tab_bar_margin_top">0dp</dimen>
     <dimen name="app_icon_size">48dp</dimen>
-    <dimen name="apps_customize_horizontal_padding">4dp</dimen>
+    <dimen name="apps_customize_horizontal_padding">0dp</dimen>
 
     <!-- The AppsCustomize page indicator -->
     <dimen name="apps_customize_page_indicator_height">12dp</dimen>
@@ -89,9 +89,8 @@
     <dimen name="app_widget_preview_padding_left">16dp</dimen>
     <dimen name="app_widget_preview_padding_right">16dp</dimen>
     <dimen name="app_widget_preview_padding_top">32dp</dimen>
-    <dimen name="app_widget_preview_label_margin_top">4dp</dimen>
-    <dimen name="app_widget_preview_label_margin_left">2dp</dimen>
-    <dimen name="app_widget_preview_label_margin_right">2dp</dimen>
+    <dimen name="app_widget_preview_label_vertical_padding">8dp</dimen>
+    <dimen name="app_widget_preview_label_horizontal_padding">8dp</dimen>
 
     <!-- Padding applied to shortcut previews -->
     <dimen name="shortcut_preview_padding_left">0dp</dimen>
-- 
cgit v1.2.3