diff options
| author | Jake Hamby <jhamby@google.com> | 2012-06-11 17:04:14 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2012-11-20 18:21:44 -0800 |
| commit | 95c1003f1c6ea957065fa752d89c9f64b599461c (patch) | |
| tree | 323e9a1ae4da1fc64bb7eaafe8173f45fee4f41a /src | |
| parent | e9f89cfbf5309453e8efc2826815592660e9e1c2 (diff) | |
| download | packages_apps_settings-95c1003f1c6ea957065fa752d89c9f64b599461c.zip packages_apps_settings-95c1003f1c6ea957065fa752d89c9f64b599461c.tar.gz packages_apps_settings-95c1003f1c6ea957065fa752d89c9f64b599461c.tar.bz2 | |
Fix Bluetooth enable dialog to match Android style guide.
When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.
Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.
Bug: 6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/bluetooth/RequestPermissionActivity.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java | 16 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java index 08c10fb..9f266a5 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java @@ -149,8 +149,6 @@ public class RequestPermissionActivity extends Activity implements private void createDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setIcon(android.R.drawable.ic_dialog_info); - builder.setTitle(getString(R.string.bluetooth_permission_request)); if (mNeededToEnableBluetooth) { // RequestPermissionHelperActivity has gotten confirmation from user @@ -167,8 +165,8 @@ public class RequestPermissionActivity extends Activity implements builder.setMessage( getString(R.string.bluetooth_ask_discovery, mTimeout)); } - builder.setPositiveButton(getString(R.string.yes), this); - builder.setNegativeButton(getString(R.string.no), this); + builder.setPositiveButton(getString(R.string.allow), this); + builder.setNegativeButton(getString(R.string.deny), this); } mDialog = builder.create(); diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java index 5c4b828..f108513 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java @@ -72,26 +72,20 @@ public class RequestPermissionHelperActivity extends AlertActivity implements void createDialog() { final AlertController.AlertParams p = mAlertParams; - p.mIconId = android.R.drawable.ic_dialog_info; - p.mTitle = getString(R.string.bluetooth_permission_request); - - View view = getLayoutInflater().inflate(R.layout.bluetooth_discoverable, null); - p.mView = view; - TextView tv = (TextView) view.findViewById(R.id.message); if (mEnableOnly) { - tv.setText(getString(R.string.bluetooth_ask_enablement)); + p.mMessage = getString(R.string.bluetooth_ask_enablement); } else { if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) { - tv.setText(getString(R.string.bluetooth_ask_enablement_and_lasting_discovery)); + p.mMessage = getString(R.string.bluetooth_ask_enablement_and_lasting_discovery); } else { - tv.setText(getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout)); + p.mMessage = getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout); } } - p.mPositiveButtonText = getString(R.string.yes); + p.mPositiveButtonText = getString(R.string.allow); p.mPositiveButtonListener = this; - p.mNegativeButtonText = getString(R.string.no); + p.mNegativeButtonText = getString(R.string.deny); p.mNegativeButtonListener = this; setupAlert(); |