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 /tests/res | |
| parent | e9f89cfbf5309453e8efc2826815592660e9e1c2 (diff) | |
| download | packages_apps_Settings-95c1003f1c6ea957065fa752d89c9f64b599461c.tar.gz packages_apps_Settings-95c1003f1c6ea957065fa752d89c9f64b599461c.tar.bz2 packages_apps_Settings-95c1003f1c6ea957065fa752d89c9f64b599461c.zip | |
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 'tests/res')
| -rw-r--r-- | tests/res/layout/bluetooth_request_permission_test.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/res/layout/bluetooth_request_permission_test.xml b/tests/res/layout/bluetooth_request_permission_test.xml index 0a5aec0dc..b62db197c 100644 --- a/tests/res/layout/bluetooth_request_permission_test.xml +++ b/tests/res/layout/bluetooth_request_permission_test.xml @@ -32,19 +32,19 @@ style="@android:style/ButtonBar"> <Button android:id="@+id/enable" - android:layout_width="0dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/enable" /> <Button android:id="@+id/discoverable" - android:layout_width="0dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/discoverable" /> <Button android:id="@+id/scan" - android:layout_width="0dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/start_scan" /> |