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

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

Browse Source
This commit is contained in:
Ze Li
2025-03-11 07:29:29 -07:00
committed by Android (Google) Code Review
parent f5b9302119 6e0bbb6259
commit 35b5d88170
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/bluetooth_pin_confirm.xml
View File

@@ -101,7 +101,8 @@
android:hyphenationFrequency="normalFast" android:hyphenationFrequency="normalFast"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption" />
</LinearLayout> </LinearLayout>
<Switch <com.google.android.material.materialswitch.MaterialSwitch
android:theme="@style/Theme.Material3.DynamicColors.DayNight"
android:id="@+id/phonebook_sharing_message_confirm_pin" android:id="@+id/phonebook_sharing_message_confirm_pin"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="48dp"

22
src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
View File

@@ -250,17 +250,19 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
TextView messageViewCaptionHint = (TextView) view.findViewById(R.id.pin_values_hint); TextView messageViewCaptionHint = (TextView) view.findViewById(R.id.pin_values_hint);
TextView messageView2 = (TextView) view.findViewById(R.id.message_below_pin); TextView messageView2 = (TextView) view.findViewById(R.id.message_below_pin);
CheckBox alphanumericPin = (CheckBox) view.findViewById(R.id.alphanumeric_pin); CheckBox alphanumericPin = (CheckBox) view.findViewById(R.id.alphanumeric_pin);
CheckBox contactSharing = (CheckBox) view.findViewById(
R.id.phonebook_sharing_message_entry_pin); CheckBox contactSharing =
contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook)); (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); 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; mPairingView = pairingView;
pairingView.setInputType(InputType.TYPE_CLASS_NUMBER); pairingView.setInputType(InputType.TYPE_CLASS_NUMBER);