Merge "Use holographic style for BT pairing dialogs." into honeycomb

This commit is contained in:
Jake Hamby
2011-01-07 10:53:52 -08:00
committed by Android (Google) Code Review

View File

@@ -849,7 +849,7 @@
<activity android:name=".bluetooth.BluetoothPairingDialog"
android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Dialog.Alert">
android:theme="@*android:style/Theme.Holo.Dialog.Alert">
<intent-filter>
<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<category android:name="android.intent.category.DEFAULT" />
@@ -873,7 +873,7 @@
android:label="@string/bluetooth_permission_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH"
android:theme="@*android:style/Theme.Dialog.Alert">
android:theme="@*android:style/Theme.Holo.Dialog.Alert">
<intent-filter>
<action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
<action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -885,7 +885,7 @@
android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH"
android:theme="@*android:style/Theme.Dialog.Alert">
android:theme="@*android:style/Theme.Holo.Dialog.Alert">
</activity>
<receiver android:name=".bluetooth.BluetoothPairingRequest">