diff options
| author |   Dan Zivkovic <zivkovic@google.com> | 2015-01-16 17:56:02 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 17:56:02 +0000 |
| commit | 2a689958b7d86cd9d600ab1895f11e6dd75b3cc0 (patch) | |
| tree | 084d109dd7331cc1568360c6d20e0b655aa8dbc1 /java/res | |
| parent | a0b9e57af47bc20b6fedec802f4ada8c5b5ba8c5 (diff) | |
| parent | fc470076741a61a7133590d63fc5241ee1343d2e (diff) | |
| download | latinime-2a689958b7d86cd9d600ab1895f11e6dd75b3cc0.tar.gz latinime-2a689958b7d86cd9d600ab1895f11e6dd75b3cc0.tar.xz latinime-2a689958b7d86cd9d600ab1895f11e6dd75b3cc0.zip | |
am fc470076: Merge "AOSP change for showing the app icon."
* commit 'fc470076741a61a7133590d63fc5241ee1343d2e':
AOSP change for showing the app icon.
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/setup-wizard.xml | 1 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_advanced.xml | 6 |
3 files changed, 0 insertions, 11 deletions
diff --git a/java/res/values/setup-wizard.xml b/java/res/values/setup-wizard.xml index 84647090b..90c3ecac9 100644 --- a/java/res/values/setup-wizard.xml +++ b/java/res/values/setup-wizard.xml @@ -18,5 +18,4 @@ */ --> <resources> - <bool name="config_setup_wizard_available">false</bool> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 5eaac09a3..2e9c8ea1f 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -413,10 +413,6 @@ mobile devices. [CHAR LIMIT=25] --> <string name="setup_step3_action">Configure additional languages</string> <!-- The label of the button that finishes the setup wizard. [CHAR_LIMIT=64] --> <string name="setup_finish_action">Finished</string> - <!-- Option to show setup wizard icon. [CHAR LIMIT=30]--> - <string name="show_setup_wizard_icon">Show app icon</string> - <!-- Description for the option to show setup wizard application icon of this IME in the laucher. [CHAR_LIMIT=65] --> - <string name="show_setup_wizard_icon_summary">Display application icon in the launcher</string> <!-- The dictionary provider application name. Visible in Settings/Applications/Manage applications. --> <string name="app_name">Dictionary Provider</string> diff --git a/java/res/xml/prefs_screen_advanced.xml b/java/res/xml/prefs_screen_advanced.xml index 1fa6fd0c4..402132e67 100644 --- a/java/res/xml/prefs_screen_advanced.xml +++ b/java/res/xml/prefs_screen_advanced.xml @@ -43,12 +43,6 @@ android:summary="@string/prefs_enable_emoji_alt_physical_key_summary" android:defaultValue="true" android:persistent="true" /> - <!-- The settings for showing setup wizard application icon shouldn't be persistent and - the default value is added programmatically. --> - <CheckBoxPreference - android:key="pref_show_setup_wizard_icon" - android:title="@string/show_setup_wizard_icon" - android:summary="@string/show_setup_wizard_icon_summary" /> <!-- title will be set programmatically to embed application name --> <CheckBoxPreference android:key="pref_enable_metrics_logging" |