diff options
| author | Matthew Xie <mattx@google.com> | 2011-08-18 17:12:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-18 17:12:33 -0700 |
| commit | 92f92b5449e959b0563e1fdbc79a39e6f1743733 (patch) | |
| tree | 6ffbc4228aaed5472cb9481e8017b744f2f86982 /res | |
| parent | 33d76c309144551d3c5e481758d410e892fcf5f2 (diff) | |
| parent | b707255a440e53ec2865c4b34c7ea07d16d471bd (diff) | |
| download | packages_apps_settings-92f92b5449e959b0563e1fdbc79a39e6f1743733.zip packages_apps_settings-92f92b5449e959b0563e1fdbc79a39e6f1743733.tar.gz packages_apps_settings-92f92b5449e959b0563e1fdbc79a39e6f1743733.tar.bz2 | |
Merge "Remember user choice for phone book access permission dialog"
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/bluetooth_pb_access.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml index 80f78a6..24f0df2 100644 --- a/res/layout/bluetooth_pb_access.xml +++ b/res/layout/bluetooth_pb_access.xml @@ -36,12 +36,12 @@ android:gravity="center_horizontal" android:textAppearance="?android:attr/textAppearanceMedium" /> - <CheckBox android:id="@+id/bluetooth_pb_alwaysallowed" + <CheckBox android:id="@+id/bluetooth_pb_remember_choice" style="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="2dip" - android:text="@string/bluetooth_pb_alwaysallowed" /> + android:text="@string/bluetooth_pb_remember_choice" /> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index c9bfb7f..7e73bca 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -323,7 +323,7 @@ <string name="bluetooth_pb_acceptance_dialog_text">%1$s would like to access your contacts and call history. Give access to %2$s?</string> <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] --> - <string name="bluetooth_pb_alwaysallowed">Always allowed?</string> + <string name="bluetooth_pb_remember_choice">Don\'t ask again</string> <!-- Date & time settings screen title --> <string name="date_and_time">Date & time settings</string> |