From d784b52040dc1d688b5f98c186038ab188669040 Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Mon, 10 Nov 2014 10:35:00 -0800
Subject: Customizeable Dynamic Grid:

 - Presets
   - Comfortable (+0)
   - Cozy (+1)
   - Condensed (+2)
 - Custom option with min, max

Reordering items in the settings pane for better organization
Modifying Settings Layout for readability

Conflicts:
	res/layout/settings_pane_list_item.xml
	res/values/cm_strings.xml
	src/com/android/launcher3/DeviceProfile.java
	src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java

Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5
---
 res/values/dimens.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'res/values/dimens.xml')

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 29a6c39e2..4980e0957 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -107,4 +107,10 @@
 
     <!-- Settings Pane dimen -->
     <dimen name="settings_pane_handle">48dp</dimen>
+
+    <!-- Dynamic Grid settings -->
+    <dimen name="dialog_padding">10dp</dimen>
+
+    <dimen name="grid_padding">15dp</dimen>
+    <dimen name="grid_custom_text">50dp</dimen>
 </resources>
-- 
cgit v1.2.3