summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2014-07-02 23:36:27 +0200
committerRajesh Yengisetty <rajesh@cyngn.com>2014-08-06 16:38:04 +0000
commit2ce97880ca19ee79f7bafec4c44fb1aa9dce7c9c (patch)
tree465a195379605f29a2961eac6277f29294e424f9 /res
parent35adb26e56973506eab6b0140da573072ca06a34 (diff)
downloadandroid_packages_apps_Trebuchet-2ce97880ca19ee79f7bafec4c44fb1aa9dce7c9c.tar.gz
android_packages_apps_Trebuchet-2ce97880ca19ee79f7bafec4c44fb1aa9dce7c9c.tar.bz2
android_packages_apps_Trebuchet-2ce97880ca19ee79f7bafec4c44fb1aa9dce7c9c.zip
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
Diffstat (limited to 'res')
-rw-r--r--res/drawable/grid.pngbin1971 -> 0 bytes
-rw-r--r--res/drawable/grid_comfortable.pngbin1984 -> 0 bytes
-rw-r--r--res/drawable/grid_condensed.pngbin2033 -> 0 bytes
-rw-r--r--res/drawable/grid_cozy.pngbin2006 -> 0 bytes
-rw-r--r--res/layout/dynamic_grid_size_screen.xml4
-rw-r--r--res/values/colors.xml3
6 files changed, 5 insertions, 2 deletions
diff --git a/res/drawable/grid.png b/res/drawable/grid.png
deleted file mode 100644
index 79fe901d1..000000000
--- a/res/drawable/grid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/grid_comfortable.png b/res/drawable/grid_comfortable.png
deleted file mode 100644
index 34e3ef2ee..000000000
--- a/res/drawable/grid_comfortable.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/grid_condensed.png b/res/drawable/grid_condensed.png
deleted file mode 100644
index ebc9d4e54..000000000
--- a/res/drawable/grid_condensed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/grid_cozy.png b/res/drawable/grid_cozy.png
deleted file mode 100644
index 929bcb541..000000000
--- a/res/drawable/grid_cozy.png
+++ /dev/null
Binary files 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>