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

Commit 32fd735a authored by Salvador Martinez's avatar Salvador Martinez Committed by Android (Google) Code Review
Browse files

Merge "BluetoothDialog view fixed for no pair code case"

parents 8fdb96e3 4d279a56

res/layout/bluetooth_pin_confirm.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        android:paddingStart="16dip"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/bluetooth_dialog_padding_top"

        android:orientation="vertical">



        <TextView

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ 


    <!-- Bluetooth Preferences -->

    <dimen name="bluetooth_dialog_padding">8dip</dimen>

    <dimen name="bluetooth_dialog_padding_top">20dp</dimen>

    <integer name="bluetooth_name_length">32</integer>

    <dimen name="bluetooth_pairing_padding">24dp</dimen>

    <dimen name="bluetooth_pairing_edittext_padding">21dp</dimen>

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

+2 −0
Original line number Diff line number Diff line
@@ -309,6 +309,8 @@ public final class BluetoothPairingDialog extends AlertActivity implements 
                break;



            case BluetoothDevice.PAIRING_VARIANT_CONSENT:

                messagePairing.setVisibility(view.GONE);

                break;

            case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:

                messagePairing.setVisibility(View.VISIBLE);

                break;