From 2efec86bae2771e3085ce5ec104168efa660fbeb Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Fri, 7 Jul 2017 11:09:24 -0700 Subject: [PATCH] Get rid of spurious gear icon in BT details page The problem is that we were calling done() on the EntityHeaderController and passing false for whether to rebind the action buttons, which means we were getting the default behavior including a visible gear icon. Passing true to request rebinding causes that icon to be hidden. Bug: 63405635 Test: make RunSettingsRoboTests Change-Id: I031f4a2d176ff3be025cc2675d7026a679936b03 --- .../settings/bluetooth/BluetoothDetailsHeaderController.java | 2 +- .../bluetooth/BluetoothDetailsHeaderControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index 74f95fe1f98..2a5da3a8b3b 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -64,7 +64,7 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController @Override protected void refresh() { setHeaderProperties(); - mHeaderController.done(mFragment.getActivity(), false); + mHeaderController.done(mFragment.getActivity(), true /* rebindActions */); } @Override diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 7e9a0b68ca3..a50f8bf9fd2 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -81,7 +81,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