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

Commit 0f01eeff authored by PauloftheWest's avatar PauloftheWest Committed by Android (Google) Code Review
Browse files

Merge "Removed an extraneous messge when pairing." into lmp-dev

parents 4241b0a9 10773b4d

res/layout/bluetooth_pin_confirm.xml

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


    <LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:paddingStart="16dip"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:orientation="vertical">

res/layout/bluetooth_pin_entry.xml

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ 
            android:layout_marginStart="@dimen/bluetooth_dialog_padding"

            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"

            android:gravity="center_vertical"

            android:textAppearance="?android:attr/textAppearanceMedium" />

            android:textAppearance="@android:style/TextAppearance.Material.Subhead"

            android:textColor="@*android:color/secondary_text_material_light"/>



        <TextView

            android:id="@+id/phonebook_sharing_message"

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

+2 −1
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ public final class BluetoothPairingDialog extends AlertActivity implements 
        switch (mType) {

            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY:

            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN:

                messagePairing.setVisibility(View.VISIBLE);

            case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION:

                messageCaption = getString(R.string.bluetooth_enter_pin_msg);

                pairingContent = mPairingKey;
@@ -242,6 +243,7 @@ public final class BluetoothPairingDialog extends AlertActivity implements 


            case BluetoothDevice.PAIRING_VARIANT_CONSENT:

            case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:

                messagePairing.setVisibility(View.VISIBLE);

                messageCaption = getString(R.string.bluetooth_enter_pin_msg);

                break;
@@ -259,7 +261,6 @@ public final class BluetoothPairingDialog extends AlertActivity implements 
            pairingViewCaption.setVisibility(View.VISIBLE);

            pairingViewContent.setVisibility(View.VISIBLE);

            pairingViewContent.setText(pairingContent);

            messagePairing.setVisibility(View.VISIBLE);

        }



        return view;