Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee am: 039fd6adf6 am: bd34c8c190 am: 8be19235dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620 Change-Id: I39b1c8591a9d529585697dfbf041d8be0a7f1346 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -361,8 +361,10 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
|
||||
messagePairingSet.setText(getString(R.string.bluetooth_pairing_group_late_bonding));
|
||||
}
|
||||
|
||||
messagePairingSet.setVisibility(mPairingController.isCoordinatedSetMemberDevice()
|
||||
? View.VISIBLE : View.GONE);
|
||||
boolean setPairingMessage =
|
||||
mPairingController.isCoordinatedSetMemberDevice() || mPairingController.isLateBonding();
|
||||
|
||||
messagePairingSet.setVisibility(setPairingMessage ? View.VISIBLE : View.GONE);
|
||||
return view;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user