From 6e0bbb6259b88de5afaf13d15299f7b2208cae0b Mon Sep 17 00:00:00 2001
From: Ze Li <lze@google.com>
Date: Tue, 11 Mar 2025 15:45:04 +0800
Subject: [PATCH] [Bluetooth Pairing] Change allow phone book permission Switch
 to Material3 style.

Test: manual test
Bug: 318785412
Flag: EXEMPT bug fix
Change-Id: I5546cb504a6db939a4ab62264d496adcf93aa0e2
---
 res/layout/bluetooth_pin_confirm.xml          |  3 ++-
 .../BluetoothPairingDialogFragment.java       | 22 ++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 9387d5ddd82..69ea777c9f2 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -101,7 +101,8 @@
                     android:hyphenationFrequency="normalFast"
                     android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption" />
             </LinearLayout>
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:theme="@style/Theme.Material3.DynamicColors.DayNight"
                 android:id="@+id/phonebook_sharing_message_confirm_pin"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index 9d54b1de845..476f00206fe 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -250,17 +250,19 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
         TextView messageViewCaptionHint = (TextView) view.findViewById(R.id.pin_values_hint);
         TextView messageView2 = (TextView) view.findViewById(R.id.message_below_pin);
         CheckBox alphanumericPin = (CheckBox) view.findViewById(R.id.alphanumeric_pin);
-        CheckBox contactSharing = (CheckBox) view.findViewById(
-                R.id.phonebook_sharing_message_entry_pin);
-        contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook));
+
+        CheckBox contactSharing =
+                (CheckBox) view.findViewById(R.id.phonebook_sharing_message_entry_pin);
+        if (contactSharing != null) {
+            contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook));
+            contactSharing.setVisibility(
+                    mPairingController.isContactSharingVisible() ? View.VISIBLE : View.GONE);
+            mPairingController.setContactSharingState();
+            contactSharing.setOnCheckedChangeListener(mPairingController);
+            contactSharing.setChecked(mPairingController.getContactSharingState());
+        }
+
         EditText pairingView = (EditText) view.findViewById(R.id.text);
-
-        contactSharing.setVisibility(
-                mPairingController.isContactSharingVisible() ? View.VISIBLE : View.GONE);
-        mPairingController.setContactSharingState();
-        contactSharing.setOnCheckedChangeListener(mPairingController);
-        contactSharing.setChecked(mPairingController.getContactSharingState());
-
         mPairingView = pairingView;
 
         pairingView.setInputType(InputType.TYPE_CLASS_NUMBER);