PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When BT is off hide rename preference" into pi-dev am: a419c4717d

Browse Source 
am: a29fe74817

Change-Id: I9e2068de44126344af52532fbe076acd9121883d
This commit is contained in:
hughchen
2018-05-22 11:18:15 -07:00
committed by android-build-merger
parent 17939388e3 a29fe74817
commit d9f1e1c049
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
View File

@@ -46,7 +46,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
@VisibleForTesting @VisibleForTesting
Preference mPreference; Preference mPreference;
private LocalBluetoothManager mLocalManager; private LocalBluetoothManager mLocalManager;
private LocalBluetoothAdapter mLocalAdapter; protected LocalBluetoothAdapter mLocalAdapter;
/** /**
* Constructor exclusively used for Slice. * Constructor exclusively used for Slice.
@@ -77,8 +77,10 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
@Override @Override
public void onStart() { public void onStart() {
mContext.registerReceiver(mReceiver, final IntentFilter intentFilter = new IntentFilter();
new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)); intentFilter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
mContext.registerReceiver(mReceiver, intentFilter);
} }
@Override @Override
@@ -93,7 +95,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
updateDeviceName(preference); updatePreferenceState(preference);
} }
@Override @Override
@@ -129,7 +131,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
* *
* @param preference to set the summary for * @param preference to set the summary for
*/ */
protected void updateDeviceName(final Preference preference) { protected void updatePreferenceState(final Preference preference) {
preference.setSelectable(false); preference.setSelectable(false);
preference.setSummary(getSummary()); preference.setSummary(getSummary());
} }
@@ -150,8 +152,10 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
if (TextUtils.equals(action, BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) { if (TextUtils.equals(action, BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
if (mPreference != null && mLocalAdapter != null && mLocalAdapter.isEnabled()) { if (mPreference != null && mLocalAdapter != null && mLocalAdapter.isEnabled()) {
updateDeviceName(mPreference); updatePreferenceState(mPreference);
} }
} else if (TextUtils.equals(action, BluetoothAdapter.ACTION_STATE_CHANGED)) {
updatePreferenceState(mPreference);
} }
} }
}; };

3
src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
View File

@@ -58,8 +58,9 @@ public class BluetoothDeviceRenamePreferenceController extends
} }
@Override @Override
protected void updateDeviceName(final Preference preference) { protected void updatePreferenceState(final Preference preference) {
preference.setSummary(getSummary()); preference.setSummary(getSummary());
preference.setVisible(mLocalAdapter != null && mLocalAdapter.isEnabled());
} }
@Override @Override

2
tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
View File

@@ -70,7 +70,7 @@ public class BluetoothDeviceNamePreferenceControllerTest {
@Test @Test
public void testUpdateDeviceName_showSummaryWithDeviceName() { public void testUpdateDeviceName_showSummaryWithDeviceName() {
mController.updateDeviceName(mPreference); mController.updatePreferenceState(mPreference);
final CharSequence summary = mPreference.getSummary(); final CharSequence summary = mPreference.getSummary();

26
tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
View File

@@ -71,11 +71,13 @@ public class BluetoothDeviceRenamePreferenceControllerTest {
PREF_KEY)); PREF_KEY));
mController.setFragment(mFragment); mController.setFragment(mFragment);
doReturn(DEVICE_NAME).when(mController).getDeviceName(); doReturn(DEVICE_NAME).when(mController).getDeviceName();
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
} }
@Test @Test
public void testUpdateDeviceName_showSummaryWithDeviceName() { public void testUpdateDeviceName_showSummaryWithDeviceName() {
mController.updateDeviceName(mPreference); mController.updatePreferenceState(mPreference);
final CharSequence summary = mPreference.getSummary(); final CharSequence summary = mPreference.getSummary();
@@ -94,10 +96,24 @@ public class BluetoothDeviceRenamePreferenceControllerTest {
@Test @Test
public void displayPreference_shouldFindPreferenceWithMatchingPrefKey() { public void displayPreference_shouldFindPreferenceWithMatchingPrefKey() {
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
assertThat(mController.mPreference.getKey()).isEqualTo(mController.getPreferenceKey()); assertThat(mController.mPreference.getKey()).isEqualTo(mController.getPreferenceKey());
} }
@Test
public void updatePreferenceState_whenBTisOnPreferenceShouldBeVisible() {
when(mLocalAdapter.isEnabled()).thenReturn(true);
mController.updatePreferenceState(mPreference);
assertThat(mPreference.isVisible()).isTrue();
}
@Test
public void updatePreferenceState_whenBTisOffPreferenceShouldBeHide() {
when(mLocalAdapter.isEnabled()).thenReturn(false);
mController.updatePreferenceState(mPreference);
assertThat(mPreference.isVisible()).isFalse();
}
} }