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

Commit e29ec31e authored by Michał Narajowski's avatar Michał Narajowski Committed by Automerger Merge Worker
Browse files

Merge changes from topic "late-bonding" into udc-dev am: a0c24932 am: 40299749 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620



Change-Id: I660cdf43190bfa9afc7f34b717dfc95b16a71173
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68dc0539 40299749

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

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

    }

}