summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2014-11-22 00:00:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-22 00:00:30 +0000
commit1eb838ec83b63fa82148bd65eadf808425918f6e (patch)
tree1a5918a55e0b8db89ecce7439bc9916e85da3b23 /res/layout
parent72c70cb0985e5bc9ca12cdb99940862ae8d42685 (diff)
parent626d1fc0f78aa634778b7cc1ac860c35f6a83213 (diff)
downloadpackages_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/layout')
-rw-r--r--res/layout/multi_sim_dialog.xml2
1 files changed, 1 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"