diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_menu_overflow.png | bin | 0 -> 144 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_overflow.png | bin | 0 -> 122 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_overflow.png | bin | 0 -> 167 bytes | |||
-rw-r--r-- | res/layout/dialog_title_overflow_menu.xml | 35 | ||||
-rw-r--r-- | res/menu/scrolling_settings.xml | 10 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 6 | ||||
-rw-r--r-- | res/values/preferences_defaults.xml | 2 | ||||
-rw-r--r-- | res/xml/preferences_homescreen.xml | 6 |
8 files changed, 50 insertions, 9 deletions
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 000000000..2abc45809 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_overflow.png diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 000000000..ba704b67e --- /dev/null +++ b/res/drawable-mdpi/ic_menu_overflow.png diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 000000000..a92fb1d4a --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_overflow.png diff --git a/res/layout/dialog_title_overflow_menu.xml b/res/layout/dialog_title_overflow_menu.xml new file mode 100644 index 000000000..636384223 --- /dev/null +++ b/res/layout/dialog_title_overflow_menu.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <LinearLayout android:id="@+id/title_template" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical" + android:minHeight="64dip" + android:layout_marginStart="16dip" + android:layout_marginEnd="16dip"> + <ImageView android:id="@android:id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingEnd="8dip" + android:src="@null" /> + <TextView android:id="@android:id/title" + android:textAppearance="@android:style/TextAppearance.Holo.DialogWindowTitle" + android:singleLine="true" + android:ellipsize="end" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textAlignment="viewStart" /> + <ImageButton android:id="@+id/overflow_menu_button" + android:background="?android:actionBarItemBackground" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|right" + android:padding="6dip" + android:src="@drawable/ic_menu_overflow"/> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/menu/scrolling_settings.xml b/res/menu/scrolling_settings.xml new file mode 100644 index 000000000..e29a3cac6 --- /dev/null +++ b/res/menu/scrolling_settings.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/scrolling_page_outlines" + android:checkable="true" + android:title="@string/scrolling_page_outlines"/> + <item android:id="@+id/scrolling_fade_adjacent" + android:checkable="true" + android:title="@string/scrolling_fade_adjacent"/> +</menu>
\ No newline at end of file diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 028426970..fbaa53143 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -19,6 +19,9 @@ <string name="sort_mode_launch_count">Launch Count</string> <string name="sort_mode_install_time">Install Time</string> + <string name="scrolling_page_outlines">Page outlines</string> + <string name="scrolling_fade_adjacent">Fade side pages</string> + <string name="wallpaper_scroll">Scroll wallpaper</string> @@ -35,9 +38,6 @@ <string name="preferences_interface_homescreen_summary">Screens and wallpaper</string> <string name="preferences_interface_homescreen_search_title">Search bar</string> <string name="preferences_interface_homescreen_search_summary">Show persistent search bar at top of screen</string> - <string name="preferences_interface_homescreen_scrolling_category">Scrolling</string> - <string name="preferences_interface_homescreen_scrolling_page_outlines_title">Page outlines</string> - <string name="preferences_interface_homescreen_scrolling_page_outlines_summary">Show page outlines while scrolling homescreens</string> <!-- Drawer --> <string name="preferences_interface_drawer_title">Drawer</string> diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index ebb1650f4..288157381 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -4,7 +4,9 @@ <string name="preferences_interface_homescreen_scrolling_transition_effect">none</string> <bool name="preferences_interface_homescreen_scrolling_wallpaper_scroll_default">true</bool> <bool name="preferences_interface_homescreen_scrolling_page_outlines_default">@bool/config_workspaceDefaultShowOutlines</bool> + <bool name="preferences_interface_homescreen_scrolling_fade_adjacent_default">@bool/config_workspaceFadeAdjacentScreens</bool> <string name="preferences_interface_drawer_scrolling_transition_effect">stack</string> + <bool name="preferences_interface_drawer_scrolling_fade_adjacent_default">false</bool> <bool name="preferences_interface_general_icons_large_default">@bool/config_largeIcons</bool> <string name="preferences_interface_general_icons_text_font_family_default">sans-serif-condensed</string> <integer name="preferences_interface_general_icons_text_font_style_default">0</integer> diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml index 438611808..8b2652b9a 100644 --- a/res/xml/preferences_homescreen.xml +++ b/res/xml/preferences_homescreen.xml @@ -22,10 +22,4 @@ android:title="@string/preferences_interface_homescreen_search_title" android:summary="@string/preferences_interface_homescreen_search_summary" android:defaultValue="@bool/preferences_interface_homescreen_search_default" /> - <PreferenceCategory android:title="@string/preferences_interface_homescreen_scrolling_category"> - <CheckBoxPreference android:key="ui_homescreen_scrolling_page_outlines" - android:title="@string/preferences_interface_homescreen_scrolling_page_outlines_title" - android:summary="@string/preferences_interface_homescreen_scrolling_page_outlines_summary" - android:defaultValue="@bool/preferences_interface_homescreen_scrolling_page_outlines_default" /> - </PreferenceCategory> </PreferenceScreen> |