Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27f62fda authored by jackqdyulei's avatar jackqdyulei
Browse files

Update BT pairing dialog 

1. Remove hardcoded color
2. Add taskAffinity for activity

Fixes: 124953564
Fixes: 124958778
Test: Manual
Change-Id: Id57fadc02e3c4fa3683632c0ad6a451117b732f1
parent 41fb8136

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />

res/layout/bluetooth_pin_confirm.xml

+2 −5
Original line number Diff line number Diff line
@@ -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>

res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -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>