summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2014-06-20 13:39:50 -0700
committerMatt Garnes <matt@cyngn.com>2014-07-15 12:02:49 -0700
commit4a65b0c3022357d2b14db196224931cc35f14417 (patch)
treea7cf6c311589d8430f0a50627d894815380ad7da /res
parent7a1a596b98941f7bda517e5c401086e57c9dff61 (diff)
downloadandroid_packages_apps_Trebuchet-4a65b0c3022357d2b14db196224931cc35f14417.tar.gz
android_packages_apps_Trebuchet-4a65b0c3022357d2b14db196224931cc35f14417.tar.bz2
android_packages_apps_Trebuchet-4a65b0c3022357d2b14db196224931cc35f14417.zip
Add support for CMHome (1/2)
Add permission for DashClock extensions. Change Trebuchet to allow viewing additional screen. Add setting that to configure Google Now / CMHome. Change-Id: I63286a2cce87455ed411bd4c77680200eec89be7
Diffstat (limited to 'res')
-rw-r--r--res/values/cm_strings.xml7
-rw-r--r--res/values/preferences_defaults.xml1
2 files changed, 7 insertions, 1 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 72bbb4a1a..76c48ad45 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -29,6 +29,10 @@
<string name="setting_state_on">ON</string>
<string name="setting_state_off">OFF</string>
+ <!-- Search Panel states -->
+ <string name="search_panel_gel">Google Now</string>
+ <string name="search_panel_custom_home">CM Home</string>
+
<!-- Themes button -->
<string name="themes_button_text">Themes</string>
@@ -88,4 +92,7 @@
<!-- Dialog -->
<string name="dialog_confirm">Confirm</string>
+ <!-- Dashclock permission info (for CMHome) -->
+ <string name="permission_desc_read_extension_data">Allows requesting DashClock extension data</string>
+ <string name="permission_label_read_extension_data">Request DashClock extension data</string>
</resources>
diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml
index 64d904a0f..a3b835dc6 100644
--- a/res/values/preferences_defaults.xml
+++ b/res/values/preferences_defaults.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="preferences_interface_homescreen_search_default">true</bool>
- <bool name="preferences_interface_homescreen_search_screen_left_default">false</bool>
<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>