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

Commit ef7f6663 authored by Antony Sargent's avatar Antony Sargent Committed by android-build-merger
Browse files

Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev 

am: db522a53

Change-Id: I85b5235bde32d6a25a708e3bd1245ba646487124
parents 3decd57c db522a53

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController 
    @Override

    protected void refresh() {

        setHeaderProperties();

        mHeaderController.done(mFragment.getActivity(), false);

        mHeaderController.done(mFragment.getActivity(), true /* rebindActions */);

    }



    @Override

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro 
        verify(mHeaderController).setIcon(any(Drawable.class));

        verify(mHeaderController).setIconContentDescription(any(String.class));

        verify(mHeaderController).setSummary(any(String.class));

        verify(mHeaderController).done(mActivity, false);

        verify(mHeaderController).done(mActivity, true);

    }



    @Test