From 27f62fda128572a430acea3d88c5a63a9e2a6881 Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Fri, 22 Feb 2019 15:31:35 -0800
Subject: [PATCH] Update BT pairing dialog

1. Remove hardcoded color
2. Add taskAffinity for activity

Fixes: 124953564
Fixes: 124958778
Test: Manual
Change-Id: Id57fadc02e3c4fa3683632c0ad6a451117b732f1
---
 AndroidManifest.xml                  | 3 ++-
 res/layout/bluetooth_pin_confirm.xml | 7 ++-----
 res/values/colors.xml                | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a94801f1dfa..8601eab003b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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" />
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index c55c9ff15d3..48912755890 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -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>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a10d1d7cd7d..7b55a2bb94b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -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>