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

Fix assist gesture settings summary

Browse Source 
Fixes: 62841640

Test: make -j RunSettingsRoboTests && manual testing of settings

Merged-In: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
This commit is contained in:
Kevin Chyn
2017-06-20 18:33:40 -07:00
parent 74a350f9c9
commit a310a50868
6 changed files with 87 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/com/android/settings/gestures/AssistGesturePreferenceController.java
View File

@@ -21,7 +21,10 @@ import android.net.Uri;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.applications.assist.AssistSettingObserver;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -44,17 +47,26 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
private PreferenceScreen mScreen;
private Preference mPreference;
public AssistGesturePreferenceController(Context context, Lifecycle lifecycle, String key) {
@VisibleForTesting
boolean mAssistOnly;
public AssistGesturePreferenceController(Context context, Lifecycle lifecycle, String key,
boolean assistOnly) {
super(context, lifecycle);
mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
mSettingObserver = new SettingObserver();
mWasAvailable = isAvailable();
mAssistGesturePrefKey = key;
mAssistOnly = assistOnly;
}
@Override
public boolean isAvailable() {
return mFeatureProvider.isSupported(mContext);
if (mAssistOnly) {
return mFeatureProvider.isSupported(mContext);
} else {
return mFeatureProvider.isSensorAvailable(mContext);
}
}
@Override
@@ -87,7 +99,7 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
return;
}
if (isAvailable()) {
if (mFeatureProvider.isSupported(mContext)) {
if (mScreen.findPreference(getPreferenceKey()) == null) {
mScreen.addPreference(mPreference);
}
@@ -96,6 +108,28 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
}
}
@Override
public void updateState(Preference preference) {
boolean isEnabled = isSwitchPrefEnabled();
if (!mAssistOnly) {
boolean assistGestureSilenceEnabled = Settings.Secure.getInt(
mContext.getContentResolver(),
Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1) != 0;
isEnabled = isEnabled || assistGestureSilenceEnabled;
}
if (preference != null) {
if (preference instanceof TwoStatePreference) {
((TwoStatePreference) preference).setChecked(isSwitchPrefEnabled());
} else {
preference.setSummary(isEnabled
? R.string.gesture_setting_on
: R.string.gesture_setting_off);
}
}
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean enabled = (boolean) newValue;