diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2014-11-22 00:00:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-22 00:00:30 +0000 |
| commit | 1eb838ec83b63fa82148bd65eadf808425918f6e (patch) | |
| tree | 1a5918a55e0b8db89ecce7439bc9916e85da3b23 /res | |
| parent | 72c70cb0985e5bc9ca12cdb99940862ae8d42685 (diff) | |
| parent | 626d1fc0f78aa634778b7cc1ac860c35f6a83213 (diff) | |
| download | packages_apps_Settings-1eb838ec83b63fa82148bd65eadf808425918f6e.zip packages_apps_Settings-1eb838ec83b63fa82148bd65eadf808425918f6e.tar.gz packages_apps_Settings-1eb838ec83b63fa82148bd65eadf808425918f6e.tar.bz2 | |
am 626d1fc0: am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev
* commit '626d1fc0f78aa634778b7cc1ac860c35f6a83213':
Changing hint string inside sim name editor dialog in settings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/multi_sim_dialog.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/res/layout/multi_sim_dialog.xml b/res/layout/multi_sim_dialog.xml index b17b86e..46fbda8 100644 --- a/res/layout/multi_sim_dialog.xml +++ b/res/layout/multi_sim_dialog.xml @@ -41,7 +41,7 @@ android:singleLine="true" android:paddingStart="@dimen/sim_content_padding" android:paddingBottom="@dimen/sim_dialog_margin_bottom" - android:hint="@string/wifi_ssid_hint" + android:hint="@string/sim_name_hint" android:inputType="textNoSuggestions" android:maxLength="@integer/sim_name_length" android:textColor="@android:color/black" diff --git a/res/values/strings.xml b/res/values/strings.xml index 79830bb..ef155b1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5526,6 +5526,8 @@ <string name="sim_slot_empty">SIM empty</string> <!-- Name label of Sim Editor. [CHAR LIMIT=40] --> <string name="sim_editor_name">SIM name</string> + <!-- Hint for SIM name in sim name editor dialog. [CHAR LIMIT=40] --> + <string name="sim_name_hint">Enter SIM name</string> <!-- Title label of Sim Editor. [CHAR LIMIT=40] --> <string name="sim_editor_title">SIM slot %1$d</string> <!-- Carrier label of Sim Editor. [CHAR LIMIT=40] --> |