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

11 files changed, 156 insertions, 12 deletions

diff --git a/res/drawable/grid.png b/res/drawable/grid.png
new file mode 100644
index 000000000..79fe901d1
--- /dev/null
+++ b/res/drawable/grid.png
diff --git a/res/drawable/grid_comfortable.png b/res/drawable/grid_comfortable.png
new file mode 100644
index 000000000..34e3ef2ee
--- /dev/null
+++ b/res/drawable/grid_comfortable.png
diff --git a/res/drawable/grid_condensed.png b/res/drawable/grid_condensed.png
new file mode 100644
index 000000000..ebc9d4e54
--- /dev/null
+++ b/res/drawable/grid_condensed.png
diff --git a/res/drawable/grid_cozy.png b/res/drawable/grid_cozy.png
new file mode 100644
index 000000000..929bcb541
--- /dev/null
+++ b/res/drawable/grid_cozy.png
diff --git a/res/layout/custom_grid_size_dialog.xml b/res/layout/custom_grid_size_dialog.xml
new file mode 100644
index 000000000..d7345ee56
--- /dev/null
+++ b/res/layout/custom_grid_size_dialog.xml
@@ -0,0 +1,33 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
+    <LinearLayout
+        android:id="@+id/grid_number_pickers"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:orientation="horizontal">
+
+        <NumberPicker
+            android:id="@+id/custom_rows"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/dialog_padding"/>
+
+        <NumberPicker
+            android:id="@+id/custom_columns"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dialog_padding"/>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/dialog_confirm_button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/dialog_confirm"
+        android:layout_below="@id/grid_number_pickers"
+        android:layout_marginTop="@dimen/dialog_padding"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/dynamic_grid_size_screen.xml b/res/layout/dynamic_grid_size_screen.xml
new file mode 100644
index 000000000..9aca72672
--- /dev/null
+++ b/res/layout/dynamic_grid_size_screen.xml
@@ -0,0 +1,52 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal|bottom"
+    android:background="@color/settings_bg_color"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/overview_panel_bottom_padding"
+    android:paddingTop="@dimen/overview_panel_bottom_padding"
+    android:clickable="true" >
+
+    <LinearLayout
+        android:id="@+id/dynamic_grid_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@drawable/listitem_bg"
+        android:clickable="true" >
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:adjustViewBounds="true"
+            android:src="@drawable/handle_left" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/grid_size_text"
+            android:textAllCaps="true"
+            android:fontFamily="sans-serif-condensed"
+            android:textColor="@android:color/white"
+            android:layout_gravity="center_vertical"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/dynamic_grid_size_image"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center_horizontal"
+        android:adjustViewBounds="true"
+        android:layout_marginBottom="@dimen/grid_padding"/>
+
+    <ListView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/dynamic_grid_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:listSelector="@android:color/transparent"
+        android:splitMotionEvents="false"/>
+</LinearLayout>
diff --git a/res/layout/hidden_apps_list.xml b/res/layout/hidden_apps_list.xml
new file mode 100644
index 000000000..fb0d4bffb
--- /dev/null
+++ b/res/layout/hidden_apps_list.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/list"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="5dp"
+    android:choiceMode="multipleChoice" />
\ No newline at end of file
diff --git a/res/layout/hidden_apps_list_item.xml b/res/layout/hidden_apps_list_item.xml
new file mode 100644
index 000000000..a00b07741
--- /dev/null
+++ b/res/layout/hidden_apps_list_item.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.launcher3.widget.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground"
+    android:descendantFocusability="blocksDescendants">
+
+    <ImageView android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center" />
+
+    <TextView android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal" />
+
+    <com.android.launcher3.widget.InertCheckBox android:id="@+id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</com.android.launcher3.widget.CheckableLinearLayout>
\ No newline at end of file
diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml
index 2a9d31b95..4bfb2880b 100644
--- a/res/layout/settings_pane_list_item.xml
+++ b/res/layout/settings_pane_list_item.xml
@@ -17,7 +17,11 @@
         android:paddingBottom="@dimen/overview_panel_list_padding"
         android:paddingTop="@dimen/overview_panel_list_padding"
         android:textSize="20sp"
-        android:textColor="@color/listitem_text"/>
+        android:textColor="@color/listitem_text"
+        android:layout_alignParentLeft="true"
+        android:scrollHorizontally="true"
+        android:ellipsize="end"
+        android:maxLines="1"/>
 
     <TextView
         android:id="@+id/item_state"
@@ -31,6 +35,10 @@
         android:paddingTop="@dimen/overview_panel_list_padding"
         android:textSize="20sp"
         android:textAllCaps="true"
-        android:textColor="@color/listitem_text" />
+        android:textColor="@color/listitem_text"
+        android:layout_toRightOf="@id/item_name"
+        android:scrollHorizontally="true"
+        android:ellipsize="end"
+        android:maxLines="1"/>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
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>