Merge "Fix some lint for Settings"

This commit is contained in:
Chaohui Wang
2022-11-04 05:28:46 +00:00
committed by Android (Google) Code Review
16 changed files with 10 additions and 32 deletions

View File

@@ -250,8 +250,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
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,
mPairingController.getDeviceName()));
contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook));
EditText pairingView = (EditText) view.findViewById(R.id.text);
contactSharing.setVisibility(
@@ -342,8 +341,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
TextView messagePairing = (TextView) view.findViewById(R.id.pairing_code_message);
CheckBox contactSharing = (CheckBox) view.findViewById(
R.id.phonebook_sharing_message_confirm_pin);
contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook,
mPairingController.getDeviceName()));
contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook));
contactSharing.setVisibility(
mPairingController.isContactSharingVisible() ? View.VISIBLE : View.GONE);