Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev

am: 6e1336bff1

Change-Id: I8d786d231ab86e18103b4df457ab7a1801df9a28
This commit is contained in:
Andrew Sapperstein
2016-06-30 17:32:29 +00:00
committed by android-build-merger
6 changed files with 1 additions and 1 deletions

View File

@@ -1994,7 +1994,7 @@
android:label="@string/bluetooth_pairing_request" android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:windowSoftInputMode="stateVisible|adjustResize" android:windowSoftInputMode="stateVisible|adjustResize"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"> android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" /> <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 B