From 2ce97880ca19ee79f7bafec4c44fb1aa9dce7c9c Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 2 Jul 2014 23:36:27 +0200
Subject: Trebuchet: Draw the dynamic grid image dynamically

This commits makes it possible to draw the image which previews
the selected grid dynamically.

Change-Id: I7c029f06110afdf1fe62145a079bba76166bb690
---
 res/drawable/grid.png                   | Bin 1971 -> 0 bytes
 res/drawable/grid_comfortable.png       | Bin 1984 -> 0 bytes
 res/drawable/grid_condensed.png         | Bin 2033 -> 0 bytes
 res/drawable/grid_cozy.png              | Bin 2006 -> 0 bytes
 res/layout/dynamic_grid_size_screen.xml |   4 ++--
 res/values/colors.xml                   |   3 +++
 6 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 res/drawable/grid.png
 delete mode 100644 res/drawable/grid_comfortable.png
 delete mode 100644 res/drawable/grid_condensed.png
 delete mode 100644 res/drawable/grid_cozy.png

(limited to 'res')

diff --git a/res/drawable/grid.png b/res/drawable/grid.png
deleted file mode 100644
index 79fe901d1..000000000
Binary files a/res/drawable/grid.png and /dev/null differ
diff --git a/res/drawable/grid_comfortable.png b/res/drawable/grid_comfortable.png
deleted file mode 100644
index 34e3ef2ee..000000000
Binary files a/res/drawable/grid_comfortable.png and /dev/null differ
diff --git a/res/drawable/grid_condensed.png b/res/drawable/grid_condensed.png
deleted file mode 100644
index ebc9d4e54..000000000
Binary files a/res/drawable/grid_condensed.png and /dev/null differ
diff --git a/res/drawable/grid_cozy.png b/res/drawable/grid_cozy.png
deleted file mode 100644
index 929bcb541..000000000
Binary files a/res/drawable/grid_cozy.png and /dev/null differ
diff --git a/res/layout/dynamic_grid_size_screen.xml b/res/layout/dynamic_grid_size_screen.xml
index 38db4b05c..5109e73d8 100644
--- a/res/layout/dynamic_grid_size_screen.xml
+++ b/res/layout/dynamic_grid_size_screen.xml
@@ -34,12 +34,12 @@
             android:textSize="16sp" />
     </LinearLayout>
 
-    <ImageView
+    <view
+        class="com.android.launcher3.DynamicGridSizeFragment$GridSizeView"
         android:id="@+id/dynamic_grid_size_image"
         android:layout_width="@dimen/dynamic_grid_size_image_width"
         android:layout_height="@dimen/dynamic_grid_size_image_height"
         android:layout_gravity="center_horizontal"
-        android:adjustViewBounds="true"
         android:layout_marginBottom="@dimen/grid_padding"/>
 
     <ListView
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 434cdf9e5..3ec8c73ba 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -43,4 +43,7 @@
     <color name="settings_bg_header_color">#FFb2b0ab</color>
     <color name="settings_bg_selected_color">#26000000</color>
     <color name="settings_transition_selected_color">#50000000</color>
+
+    <color name="dynamic_grid_preview_background">#FFFFFFFF</color>
+    <color name="dynamic_grid_preview_foreground">#FF000000</color>
 </resources>
-- 
cgit v1.2.3