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

Commit 35b5d881 authored by Ze Li's avatar Ze Li Committed by Android (Google) Code Review
Browse files

Merge "[Bluetooth Pairing] Change allow phone book permission Switch to Material3 style." into main

parents f5b93021 6e0bbb62

res/layout/bluetooth_pin_confirm.xml

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

src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java

+11 −9
Original line number Diff line number Diff line
@@ -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));

        EditText pairingView = (EditText) view.findViewById(R.id.text);



        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);

        mPairingView = pairingView;



        pairingView.setInputType(InputType.TYPE_CLASS_NUMBER);