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 | 707d1538836e2a65c0a1bb0157617e44f3ec81a2 (patch) | |
| tree | c6ca9d6e1244680e9e409f45358e8771b1cf0c05 /res | |
| parent | 4c1a4c359ff31552a66453287ecee32940661352 (diff) | |
| download | android_packages_apps_Trebuchet-707d1538836e2a65c0a1bb0157617e44f3ec81a2.tar.gz android_packages_apps_Trebuchet-707d1538836e2a65c0a1bb0157617e44f3ec81a2.tar.bz2 android_packages_apps_Trebuchet-707d1538836e2a65c0a1bb0157617e44f3ec81a2.zip | |
Move Scrolling Wallpaper to new Trebuchet Settings
Conflicts:
src/com/android/launcher3/OverviewSettingsPanel.java
src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
Change-Id: I57961ae9b6f0df334ddd2c4563ddfd7e2939f01e
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/cm_strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 23077db1e..dec9d7e81 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -117,7 +117,10 @@ <!-- 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> + <!-- Wallpaper scroll effect --> + <string name="scrolling_wallpaper">Scroll wallpaper</string> <!-- Hidden states --> <string name="hidden_folder">locked</string> |