diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-06-26 00:35:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 00:35:53 +0000 |
| commit | b41b8369687025fe8d661eae8928cbbd9733da21 (patch) | |
| tree | a28322581115ab2e0c8db4e7408c0db83f6e5dd3 | |
| parent | 1cddad6c6bff0b271e8ebde44013a5a09f273436 (diff) | |
| parent | b6e358f2f206e670c504a5eba5aa56682aad7891 (diff) | |
| download | android_packages_apps_Trebuchet-b41b8369687025fe8d661eae8928cbbd9733da21.tar.gz android_packages_apps_Trebuchet-b41b8369687025fe8d661eae8928cbbd9733da21.tar.bz2 android_packages_apps_Trebuchet-b41b8369687025fe8d661eae8928cbbd9733da21.zip | |
Merge "Enabling translation for preference string" into ub-launcher3-burnaby
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/launcher_preferences.xml | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 440a5378d..88f149bd0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -167,10 +167,8 @@ <string name="settings_button_text">Settings</string> <!-- Strings for settings --> - <!-- Title for Allow Rotation setting. [CHAR LIMIT=50] [DO NOT TRANSLATE] --> + <!-- Title for Allow Rotation setting. [CHAR LIMIT=50] --> <string name="allow_rotation_title">Allow rotation</string> - <!-- Summary for Allow Rotation setting. [CHAR LIMIT=150] [DO NOT TRANSLATE] --> - <string name="allow_rotation_summary">Allow rotation of the home screen</string> <!-- Label on an icon that references an uninstalled package, for which we have no information about when it might be installed. [CHAR_LIMIT=15] --> <string name="package_state_unknown">Unknown</string> diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml index f283575f0..624d9eb2c 100644 --- a/res/xml/launcher_preferences.xml +++ b/res/xml/launcher_preferences.xml @@ -19,7 +19,6 @@ <SwitchPreference android:key="pref_allowRotation" android:title="@string/allow_rotation_title" - android:summary="@string/allow_rotation_summary" android:defaultValue="@bool/allow_rotation" android:persistent="true" /> |