Merge "When BT is off hide rename preference" into pi-dev (a419c471) · Commits · e / os / android_packages_apps_Settings

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
		@VisibleForTesting
		Preference mPreference;
		private LocalBluetoothManager mLocalManager;
		private LocalBluetoothAdapter mLocalAdapter;
		protected LocalBluetoothAdapter mLocalAdapter;

		/**
		* Constructor exclusively used for Slice.
		@@ -77,8 +77,10 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr

		@Override
		public void onStart() {
		mContext.registerReceiver(mReceiver,
		new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED));
		final IntentFilter intentFilter = new IntentFilter();
		intentFilter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
		intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
		mContext.registerReceiver(mReceiver, intentFilter);
		}

		@Override
		@@ -93,7 +95,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr

		@Override
		public void updateState(Preference preference) {
		updateDeviceName(preference);
		updatePreferenceState(preference);
		}

		@Override
		@@ -129,7 +131,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
		*
		* @param preference to set the summary for
		*/
		protected void updateDeviceName(final Preference preference) {
		protected void updatePreferenceState(final Preference preference) {
		preference.setSelectable(false);
		preference.setSummary(getSummary());
		}
		@@ -150,8 +152,10 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr

		if (TextUtils.equals(action, BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
		if (mPreference != null && mLocalAdapter != null && mLocalAdapter.isEnabled()) {
		updateDeviceName(mPreference);
		updatePreferenceState(mPreference);
		}
		} else if (TextUtils.equals(action, BluetoothAdapter.ACTION_STATE_CHANGED)) {
		updatePreferenceState(mPreference);
		}
		}
		};

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -58,8 +58,9 @@ public class BluetoothDeviceRenamePreferenceController extends
		}

		@Override
		protected void updateDeviceName(final Preference preference) {
		protected void updatePreferenceState(final Preference preference) {
		preference.setSummary(getSummary());
		preference.setVisible(mLocalAdapter != null && mLocalAdapter.isEnabled());
		}

		@Override

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public class BluetoothDeviceNamePreferenceControllerTest {

		@Test
		public void testUpdateDeviceName_showSummaryWithDeviceName() {
		mController.updateDeviceName(mPreference);
		mController.updatePreferenceState(mPreference);

		final CharSequence summary = mPreference.getSummary();

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

+20 −4

Original line number	Diff line number	Diff line
		@@ -71,11 +71,13 @@ public class BluetoothDeviceRenamePreferenceControllerTest {
		PREF_KEY));
		mController.setFragment(mFragment);
		doReturn(DEVICE_NAME).when(mController).getDeviceName();
		when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
		mController.displayPreference(mScreen);
		}

		@Test
		public void testUpdateDeviceName_showSummaryWithDeviceName() {
		mController.updateDeviceName(mPreference);
		mController.updatePreferenceState(mPreference);

		final CharSequence summary = mPreference.getSummary();

		@@ -94,10 +96,24 @@ public class BluetoothDeviceRenamePreferenceControllerTest {

		@Test
		public void displayPreference_shouldFindPreferenceWithMatchingPrefKey() {
		when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
		assertThat(mController.mPreference.getKey()).isEqualTo(mController.getPreferenceKey());
		}

		mController.displayPreference(mScreen);
		@Test
		public void updatePreferenceState_whenBTisOnPreferenceShouldBeVisible() {
		when(mLocalAdapter.isEnabled()).thenReturn(true);

		assertThat(mController.mPreference.getKey()).isEqualTo(mController.getPreferenceKey());
		mController.updatePreferenceState(mPreference);

		assertThat(mPreference.isVisible()).isTrue();
		}

		@Test
		public void updatePreferenceState_whenBTisOffPreferenceShouldBeHide() {
		when(mLocalAdapter.isEnabled()).thenReturn(false);

		mController.updatePreferenceState(mPreference);

		assertThat(mPreference.isVisible()).isFalse();
		}
		}