diff options
author | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-23 21:23:40 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-23 21:23:40 +0000 |
commit | 2f8b1730e98969459458baa32b5d50c67b2dc4bb (patch) | |
tree | ac7631dcab888b26796a6703cdcccb0d962fdf19 /res | |
parent | 07856ffe95a4332534adf7bc7cf06f512816b9f8 (diff) | |
parent | a5ee6730d45a4c5f6ccbce4d6332881f5f15d9b6 (diff) | |
download | android_packages_apps_Trebuchet-2f8b1730e98969459458baa32b5d50c67b2dc4bb.tar.gz android_packages_apps_Trebuchet-2f8b1730e98969459458baa32b5d50c67b2dc4bb.tar.bz2 android_packages_apps_Trebuchet-2f8b1730e98969459458baa32b5d50c67b2dc4bb.zip |
Merge "Customizeable Dynamic Grid:" into cm-11.0
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/grid.png | bin | 0 -> 1971 bytes | |||
-rw-r--r-- | res/drawable/grid_comfortable.png | bin | 0 -> 1984 bytes | |||
-rw-r--r-- | res/drawable/grid_condensed.png | bin | 0 -> 2033 bytes | |||
-rw-r--r-- | res/drawable/grid_cozy.png | bin | 0 -> 2006 bytes | |||
-rw-r--r-- | res/layout/custom_grid_size_dialog.xml | 33 | ||||
-rw-r--r-- | res/layout/dynamic_grid_size_screen.xml | 52 | ||||
-rw-r--r-- | res/layout/settings_pane_list_item.xml | 19 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 15 | ||||
-rw-r--r-- | res/values/dimens.xml | 6 |
9 files changed, 119 insertions, 6 deletions
diff --git a/res/drawable/grid.png b/res/drawable/grid.png Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml index 6e6825fce..0053f4c73 100644 --- a/res/layout/settings_pane_list_item.xml +++ b/res/layout/settings_pane_list_item.xml @@ -1,4 +1,4 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" @@ -9,7 +9,7 @@ <TextView android:id="@+id/item_name" - android:layout_width="0dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" android:fontFamily="sans-serif-condensed" @@ -18,11 +18,14 @@ android:paddingTop="@dimen/overview_panel_list_padding" android:textSize="20sp" android:textColor="@color/listitem_text" - android:layout_weight="3" /> + android:layout_alignParentLeft="true" + android:scrollHorizontally="true" + android:ellipsize="end" + android:maxLines="1"/> <TextView android:id="@+id/item_state" - android:layout_width="0dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" android:fontFamily="sans-serif-condensed" @@ -32,6 +35,10 @@ android:textSize="20sp" android:textAllCaps="true" android:textColor="@color/listitem_text" - android:layout_weight="1" /> + android:layout_alignParentRight="true" + android:layout_toRightOf="@id/item_name" + android:scrollHorizontally="true" + android:ellipsize="end" + android:maxLines="1"/> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index fc628c41e..b924922fb 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -23,6 +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> + <string name="app_settings">APP SETTINGS</string> <!-- Settings states --> <string name="setting_state_on">ON</string> @@ -37,6 +38,16 @@ <!-- Wallpaper scroll effect --> <string name="scrolling_wallpaper">Scroll wallpaper</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> @@ -72,4 +83,8 @@ <!-- 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 65726056b..726b79f21 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -112,4 +112,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> |