diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/launcher.xml | 8 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 8 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 8 | ||||
| -rw-r--r-- | res/layout/overview_panel.xml | 22 | ||||
| -rw-r--r-- | res/menu/apps_customize_sort_mode.xml | 11 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 9 | ||||
| -rw-r--r-- | res/xml/preferences_general.xml | 4 | ||||
| -rw-r--r-- | res/xml/preferences_headers.xml | 2 |
8 files changed, 57 insertions, 15 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 77ea2e9aa..3666b5986 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -50,10 +50,6 @@ android:id="@+id/qsb_bar" layout="@layout/qsb_bar" /> - <include layout="@layout/overview_panel" - android:id="@+id/overview_panel" - android:visibility="gone" /> - <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on top of that view. --> @@ -97,5 +93,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/overview_panel" + android:id="@+id/overview_panel" + android:visibility="gone" /> </com.android.launcher3.DragLayer> </FrameLayout> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 6fbf7c717..11f74ba1d 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -44,10 +44,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <include layout="@layout/overview_panel" - android:id="@+id/overview_panel" - android:visibility="gone" /> - <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> <include @@ -102,5 +98,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/overview_panel" + android:id="@+id/overview_panel" + android:visibility="gone" /> </com.android.launcher3.DragLayer> </FrameLayout> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 951e63a39..4f6aaf503 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -49,10 +49,6 @@ android:id="@+id/qsb_bar" layout="@layout/qsb_bar" /> - <include layout="@layout/overview_panel" - android:id="@+id/overview_panel" - android:visibility="gone" /> - <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> <include @@ -97,5 +93,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/overview_panel" + android:id="@+id/overview_panel" + android:visibility="gone" /> </com.android.launcher3.DragLayer> </FrameLayout> diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index 46e6e07e2..ada2b2483 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -50,6 +50,17 @@ android:fontFamily="sans-serif-condensed" android:textAllCaps="true" android:textSize="12sp" /> + <TextView + android:id="@+id/sort_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/sort_button_text" + android:drawablePadding="4dp" + android:drawableTop="@drawable/wallpaper_button" + android:gravity="center_horizontal" + android:fontFamily="sans-serif-condensed" + android:textAllCaps="true" + android:textSize="12sp" /> <Space android:layout_width="@dimen/overview_panel_buttonSpacing" android:layout_height="wrap_content"/> @@ -64,6 +75,17 @@ android:fontFamily="sans-serif-condensed" android:textAllCaps="true" android:textSize="12sp"/> + <TextView + android:id="@+id/filter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/filter_button_text" + android:drawablePadding="4dp" + android:gravity="center_horizontal" + android:drawableTop="@drawable/widget_button" + android:fontFamily="sans-serif-condensed" + android:textAllCaps="true" + android:textSize="12sp"/> <Space android:layout_width="@dimen/overview_panel_buttonSpacing" android:layout_height="wrap_content"/> diff --git a/res/menu/apps_customize_sort_mode.xml b/res/menu/apps_customize_sort_mode.xml new file mode 100644 index 000000000..cb5f8faff --- /dev/null +++ b/res/menu/apps_customize_sort_mode.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <group android:checkableBehavior="single"> + <item android:id="@+id/sort_mode_title" + android:title="@string/sort_mode_title" /> + <item android:id="@+id/sort_mode_launch_count" + android:title="@string/sort_mode_launch_count" /> + <item android:id="@+id/sort_mode_install_time" + android:title="@string/sort_mode_install_time" /> + </group> +</menu>
\ No newline at end of file diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index eb0db0dbc..05cb477dd 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -5,9 +5,18 @@ <!-- App version --> <string name="application_version" translatable="false">1.0</string> + <!-- Strings for the customization mode --> + <!-- Text for sorting mode button --> + <string name="sort_button_text">Sort</string> + <!-- Text for filter button --> + <string name="filter_button_text">Filter</string> <!-- Text for default screen button --> <string name="default_screen_button_text">Default Screen</string> + <string name="sort_mode_title">Title</string> + <string name="sort_mode_launch_count">Launch Count</string> + <string name="sort_mode_install_time">Install Time</string> + <!-- Settings --> <string name="preferences_title">Settings</string> <!-- UI --> diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml index 24010b361..58e8a9aea 100644 --- a/res/xml/preferences_general.xml +++ b/res/xml/preferences_general.xml @@ -15,11 +15,11 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3" android:key="ui_general" android:title="@string/preferences_interface_general_title"> <CheckBoxPreference android:key="ui_general_large_icons" android:title="@string/preferences_interface_general_large_icons_title" android:summary="@string/preferences_interface_general_large_icons_summary" android:defaultValue="@bool/preferences_interface_general_large_icons_default" /> -</PreferenceScreen>
\ No newline at end of file +</PreferenceScreen> diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml index 303532e8f..367ef832a 100644 --- a/res/xml/preferences_headers.xml +++ b/res/xml/preferences_headers.xml @@ -28,7 +28,7 @@ android:title="@string/preferences_interface_dock_title" /> <header android:id="@+id/preferences_general_section" - android:fragment="org.cyanogenmod.trebuchet.settings.SettingsActivity$GeneralFragment" + android:fragment="com.android.launcher3.settings.SettingsActivity$GeneralFragment" android:title="@string/preferences_interface_general_title" /> <header android:id="@+id/preferences_application_section" |