Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620 Change-Id: I2ab5410a9ed3e71b244bfa96e2e4ab81ed6907f0 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.setText(getString(R.string.bluetooth_pairing_group_late_bonding));
|
||||||
}
|
}
|
||||||
|
|
||||||
messagePairingSet.setVisibility(mPairingController.isCoordinatedSetMemberDevice()
|
boolean setPairingMessage =
|
||||||
? View.VISIBLE : View.GONE);
|
mPairingController.isCoordinatedSetMemberDevice() || mPairingController.isLateBonding();
|
||||||
|
|
||||||
|
messagePairingSet.setVisibility(setPairingMessage ? View.VISIBLE : View.GONE);
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user