Update Bluetooth app to use Material-themed dialogs
Change-Id: I9cec1d41bbf8e16e1d9db0b784584f24e74cff4f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3519370..b54610b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -120,7 +120,7 @@
</receiver>
<activity android:name=".opp.BluetoothOppLauncherActivity"
android:process="@string/process"
- android:theme="@android:style/Theme.Holo.Dialog"
+ android:theme="@android:style/Theme.Material.DayNight.Dialog"
android:label="@string/bt_share_picker_label"
android:enabled="@bool/profile_supported_opp">
<intent-filter>
@@ -160,30 +160,30 @@
<activity android:name=".opp.BluetoothOppBtEnableActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+ android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
android:enabled="@bool/profile_supported_opp">
</activity>
<activity android:name=".opp.BluetoothOppBtErrorActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Holo.Dialog.Alert">
+ android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert">
</activity>
<activity android:name=".opp.BluetoothOppBtEnablingActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+ android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
android:enabled="@bool/profile_supported_opp">
</activity>
<activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+ android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
android:enabled="@bool/profile_supported_opp">
</activity>
<activity android:name=".opp.BluetoothOppTransferActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+ android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
android:enabled="@bool/profile_supported_opp">
</activity>
<activity android:name=".opp.BluetoothOppTransferHistory"
@@ -196,7 +196,7 @@
<activity android:name=".pbap.BluetoothPbapActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+ android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
android:enabled="@bool/profile_supported_pbap">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
diff --git a/AndroidManifest_test.xml b/AndroidManifest_test.xml
index 81a15d9..638484c 100644
--- a/AndroidManifest_test.xml
+++ b/AndroidManifest_test.xml
@@ -46,7 +46,8 @@
</receiver>
<activity android:name=".opp.BluetoothOppLauncherActivity"
android:process="@string/process"
- android:theme="@android:style/Theme.Holo.Dialog" android:label="@string/bt_share_picker_label">
+ android:theme="@android:style/Theme.Material.DayNight.Dialog"
+ android:label="@string/bt_share_picker_label">
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
@@ -74,8 +75,9 @@
android:process="@string/process">
</activity>
<activity android:name=".opp.BluetoothOppBtEnablingActivity"
- android:process="@string/process">
- android:theme="@android:style/Theme.Holo.Dialog"> </activity>
+ android:process="@string/process"
+ android:theme="@android:style/Theme.Material.DayNight.Dialog">
+ </activity>
<activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"
android:process="@string/process">
</activity>
@@ -85,7 +87,7 @@
<activity android:name=".pbap.BluetoothPbapActivity"
android:process="@string/process"
android:label=" "
- android:theme="@*android:style/Theme.Holo.Dialog.Alert">
+ android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
diff --git a/res/layout/confirm_dialog.xml b/res/layout/confirm_dialog.xml
index bc56e98..36afd34 100644
--- a/res/layout/confirm_dialog.xml
+++ b/res/layout/confirm_dialog.xml
@@ -20,21 +20,22 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
- android:layout_width="match_parent">
+ android:layout_width="match_parent"
+ android:paddingTop="18dp"
+ android:clipToPadding="false">
<LinearLayout
- android:layout_height="match_parent"
android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
- android:gravity="center_horizontal"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
+ android:paddingStart="?android:attr/dialogPreferredPadding"
+ style="@android:style/TextAppearance.Material.Subhead" />
</LinearLayout>