diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:00 -0800 |
---|---|---|
committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
commit | 2d1bb4321c662ee7b192b90c9476d6293c1f4885 (patch) | |
tree | b94bc7e48cb03ee8080ea1f3c548e69db131f5e9 /res | |
parent | 707d1538836e2a65c0a1bb0157617e44f3ec81a2 (diff) | |
download | android_packages_apps_Trebuchet-2d1bb4321c662ee7b192b90c9476d6293c1f4885.tar.gz android_packages_apps_Trebuchet-2d1bb4321c662ee7b192b90c9476d6293c1f4885.tar.bz2 android_packages_apps_Trebuchet-2d1bb4321c662ee7b192b90c9476d6293c1f4885.zip |
Remove old preference activity
* Also cleanup & remove unused strings
Conflicts:
AndroidManifest.xml
WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
res/values/cm_strings.xml
Change-Id: I0b9f2405ab98b0df612a18ccfaa5d9ba98876d8a
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/settings_transitions_screen.xml | 4 | ||||
-rw-r--r-- | res/values/cm_arrays.xml | 27 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 64 |
3 files changed, 39 insertions, 56 deletions
diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml index 23b3b37e9..9a517a947 100644 --- a/res/layout/settings_transitions_screen.xml +++ b/res/layout/settings_transitions_screen.xml @@ -27,7 +27,7 @@ android:id="@+id/transition_effect_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/transition_effect_button_text" + android:text="@string/scroll_effect_text" android:textAllCaps="true" android:textColor="@android:color/white" android:layout_gravity="center_vertical" @@ -48,4 +48,4 @@ android:layout_height="wrap_content" android:listSelector="@android:color/transparent" android:splitMotionEvents="false"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index de89b530b..e8b02dbcb 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -15,30 +15,19 @@ limitations under the License. --> <resources> - <string-array name="preferences_interface_general_icons_text_font_family_entries"> - <item>Regular</item> - <item>Light</item> - <item>Condensed</item> - </string-array> - <string-array name="preferences_interface_general_icons_text_font_family_values" translatable="false"> - <item>sans-serif</item> - <item>sans-serif-light</item> - <item>sans-serif-condensed</item> - </string-array> - <string-array name="transition_effect_entries"> <item>None</item> - <item>Zoom In</item> - <item>Zoom Out</item> - <item>Rotate Up</item> - <item>Rotate Down</item> - <item>Cube In</item> - <item>Cube Out</item> + <item>Zoom in</item> + <item>Zoom out</item> + <item>Rotate up</item> + <item>Rotate down</item> + <item>Cube in</item> + <item>Cube out</item> <item>Stack</item> <item>Accordion</item> <item>Flip</item> - <item>Cylinder In</item> - <item>Cylinder Out</item> + <item>Cylinder in</item> + <item>Cylinder out</item> <item>Carousel</item> <item>Overview</item> </string-array> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index dec9d7e81..c8e14ab93 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -17,29 +17,23 @@ <resources> <!-- Application name --> <string name="cm_application_name" translatable="false">Trebuchet</string> - <!-- App copyright --> - <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string> <!-- 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> - <!-- Text for transition effect button --> - <string name="transition_effect_button_text">Scroll effect</string> + <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="sort_mode_title">Title</string> - <string name="sort_mode_launch_count">Launch count</string> - <string name="sort_mode_install_time">Install time</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="scrolling_page_outlines">Page outlines</string> <string name="scrolling_fade_adjacent">Fade side pages</string> - <string name="wallpaper_scroll">Scroll wallpaper</string> <!-- Settings --> @@ -70,17 +64,12 @@ <!-- Dock --> <string name="preferences_interface_dock_title">Dock</string> + <!-- Wallpaper scroll effect --> + <string name="scrolling_wallpaper">Scroll wallpaper</string> <!-- General --> - <string name="preferences_interface_general_title">General</string> - <string name="preferences_interface_general_icons_category">Icons</string> - <string name="preferences_interface_general_icons_large_title">Larger icons</string> - <string name="preferences_interface_general_icons_large_summary">Use extra large application icons in homescreen and drawer</string> - <string name="preferences_interface_general_icons_text_style_title">Text font style</string> - <string name="preferences_interface_general_icons_text_style_summary">Variant and style of font to use for icon text</string> <string name="dialog_pick_iconpack_title">Pick icon pack</string> <string name="default_iconpack_title">Default icons</string> - <string name="icon_packs_title">Icon packs</string> <string name="no_iconpacks_summary">No icon packs installed</string> <!-- Folder titles --> @@ -99,20 +88,27 @@ <!-- Hidden apps --> <string name="hidden_apps_title">Hidden apps</string> - <string name="launcher_settings">LAUNCHER SETTINGS</string> - <string name="home_screen_settings">HOME SCREEN SETTINGS</string> - <string name="drawer_settings">DRAWER SETTINGS</string> - <!-- Text for scroll effect --> + + <!-- Scroll effect --> <string name="scroll_effect_text">Scroll effect</string> - <!-- Text for drawer sorting --> + + <!-- Drawer sorting mode --> <string name="drawer_sorting_text">Sorting mode</string> - <!-- Text for home screen search --> + + <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> + + <!-- Home screen search bar --> <string name="home_screen_search_text">Search bar</string> - <!-- Text for larger icons --> + + <!-- Larger icons --> <string name="larger_icons_text">Larger icons</string> - <!-- Text for hiding icon labels --> + + <!-- Hide icon labels --> <string name="hide_icon_labels">Hide icon labels</string> - <!-- Protected Apps --> + + <!-- Protected apps --> <string name="protected_app_settings">Protected apps</string> <!-- Settings states --> <string name="setting_state_on">ON</string> @@ -121,8 +117,6 @@ <string name="themes_button_text">Themes</string> <!-- Wallpaper scroll effect --> <string name="scrolling_wallpaper">Scroll wallpaper</string> - - <!-- Hidden states --> - <string name="hidden_folder">locked</string> - <string name="unhidden_folder">unlocked</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> </resources> |