summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2014-11-10 10:35:00 -0800
committerAdnan <adnan@cyngn.com>2014-11-19 15:53:56 -0800
commit3ada0966559cd9fee535a40686e049cd0d6f15c0 (patch)
tree0b06557595d3c49e1ff826ffa2053824c3dc2031 /res/menu
parent0daed36da7dab3172f05aa3dc29b7facac01ce6e (diff)
downloadpackages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.gz
packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.bz2
packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.zip
PagedView: Transition Effects
Conflicts: res/layout/overview_panel.xml res/values/cm_arrays.xml res/values/cm_strings.xml res/values/dimens.xml res/values/preferences_defaults.xml src/com/android/launcher3/AppsCustomizePagedView.java src/com/android/launcher3/Launcher.java src/com/android/launcher3/PagedView.java src/com/android/launcher3/Workspace.java src/com/android/launcher3/settings/SettingsProvider.java Change-Id: Ib134705952877165c334181548d577b3dceece68
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/apps_customize_sort_mode.xml11
-rw-r--r--res/menu/scrolling_settings.xml10
2 files changed, 21 insertions, 0 deletions
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/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