PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update BT pairing dialog"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-23 01:38:21 +00:00
committed by Android (Google) Code Review
parent 261d4f521b 27f62fda12
commit 962cbf424c
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -1874,7 +1874,8 @@
<activity android:name=".bluetooth.BluetoothPairingDialog"
android:excludeFromRecents="true"
android:windowSoftInputMode="stateVisible|adjustResize"
android:theme="@style/Theme.AlertDialog">
android:theme="@style/Theme.AlertDialog"
android:taskAffinity=".bluetooth.BluetoothPairingDialog">
<intent-filter android:priority="1">
<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<category android:name="android.intent.category.DEFAULT" />

7
res/layout/bluetooth_pin_confirm.xml
View File

@@ -40,8 +40,7 @@
android:gravity="center_vertical"
android:text="@string/bluetooth_pairing_key_msg"
android:visibility="gone"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="@color/bluetooth_dialog_text_color" />
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />
<TextView
android:id="@+id/pairing_subhead"
@@ -64,7 +63,6 @@
android:gravity="center_vertical"
android:text="@string/bluetooth_enter_passkey_msg"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="@color/bluetooth_dialog_text_color"
android:visibility="gone" />
<CheckBox
@@ -73,8 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bluetooth_dialog_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="@color/bluetooth_dialog_text_color" />
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />
</LinearLayout>

2
res/values/colors.xml
View File

@@ -16,8 +16,6 @@
<resources>
<color name="bluetooth_dialog_text_color">#8a000000</color>
<color name="crypt_keeper_clock_background">#ff9a9a9a</color>
<color name="crypt_keeper_clock_foreground">#ff666666</color>
<color name="crypt_keeper_clock_am_pm">#ff9a9a9a</color>