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

Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-27 00:50:10 +00:00
committed by Android (Google) Code Review
parent 063e87c689 9042f822a6
commit 8e13218ec8
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/gestures/GesturesSettingPreferenceController.java
View File

@@ -64,6 +64,7 @@ public class GesturesSettingPreferenceController extends AbstractPreferenceContr
public void updateState(Preference preference) { public void updateState(Preference preference) {
if (!mFeatureProvider.isSensorAvailable(mContext)) { if (!mFeatureProvider.isSensorAvailable(mContext)) {
preference.setSummary(""); preference.setSummary("");
return;
} }
final ContentResolver contentResolver = mContext.getContentResolver(); final ContentResolver contentResolver = mContext.getContentResolver();
final boolean assistGestureEnabled = Settings.Secure.getInt( final boolean assistGestureEnabled = Settings.Secure.getInt(

12
tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
View File

@@ -119,4 +119,16 @@ public class GesturesSettingsPreferenceControllerTest {
verify(mActivity).getString(R.string.language_input_gesture_summary_on_non_assist); verify(mActivity).getString(R.string.language_input_gesture_summary_on_non_assist);
} }
@Test
@Config(shadows = {ShadowSecureSettings.class})
public void updateState_sensorNotAvailable_shouldSetToEmptyStatus() {
final FakeFeatureFactory featureFactory =
(FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
.thenReturn(false);
mController.updateState(mPreference);
verify(mPreference).setSummary("");
}
} }