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/cm_strings.xml | 23 ++++++++++++++---------
 res/values/dimens.xml     |  6 ++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'res/values')

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index ef1d3d011..be2d91928 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -23,13 +23,7 @@
     <string name="launcher_settings">LAUNCHER SETTINGS</string>
     <string name="home_screen_settings">HOME SCREEN SETTINGS</string>
     <string name="drawer_settings">DRAWER SETTINGS</string>
-
-    <!-- Settings states -->
-    <string name="setting_state_on">ON</string>
-    <string name="setting_state_off">OFF</string>
-
-    <!-- Themes button -->
-    <string name="themes_button_text">Themes</string>
+    <string name="app_settings">APP SETTINGS</string>
 
     <string name="scrolling_page_outlines">Page outlines</string>
     <string name="scrolling_fade_adjacent">Fade side pages</string>
@@ -64,13 +58,20 @@
 
     <!-- Dock -->
     <string name="preferences_interface_dock_title">Dock</string>
-    <!-- Wallpaper scroll effect -->
-    <string name="scrolling_wallpaper">Scroll wallpaper</string>
 
     <!-- General -->
     <string name="dialog_pick_iconpack_title">Pick icon pack</string>
     <string name="default_iconpack_title">Default icons</string>
     <string name="no_iconpacks_summary">No icon packs installed</string>
+    <!-- Dynamic Grid -->
+    <string name="grid_size_text">Grid size</string>
+    <string name="grid_size_comfortable">Comfortable</string>
+    <string name="grid_size_cozy">Cozy</string>
+    <string name="grid_size_condensed">Condensed</string>
+    <string name="grid_size_custom">Custom</string>
+    <string name="preferences_interface_homescreen_custom">Select custom size</string>
+    <string name="preferences_interface_homescreen_rows_title">Number of rows</string>
+    <string name="preferences_interface_homescreen_columns_title">Number of columns</string>
 
     <!-- Folder titles -->
     <string name="google_title" translatable="false">Google</string>
@@ -121,4 +122,8 @@
     <string name="scrolling_wallpaper">Scroll wallpaper</string>
     <!-- Toast message when search screen on left is not supported -->
     <string name="search_screen_left_unsupported_toast">You must have a supported search app and CyanogenMod to use this feature.</string>
+
+    <!-- Dialog -->
+    <string name="dialog_confirm">Confirm</string>
+
 </resources>
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