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

Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: I5f0b97408748f38827486bc169b4bf134d00aa1e
This commit is contained in:
Matt Casey
2021-06-08 19:33:30 +00:00
committed by Automerger Merge Worker
parent 85d03642f9 fc10ab9c98
commit eaaff9bf24
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
View File

@@ -26,18 +26,16 @@ import com.android.settings.core.TogglePreferenceController;
*/ */
public class GestureNavigationSettingsAssistController extends TogglePreferenceController { public class GestureNavigationSettingsAssistController extends TogglePreferenceController {
// This value is based on SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
// behaviour. We assume that the gestures are enabled by default.
private static final int ASSIST_TOUCH_GESTURE_DEFAULT_VALUE = 1;
public GestureNavigationSettingsAssistController(Context context, String key) { public GestureNavigationSettingsAssistController(Context context, String key) {
super(context, key); super(context, key);
} }
@Override @Override
public boolean isChecked() { public boolean isChecked() {
boolean onByDefault = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, ASSIST_TOUCH_GESTURE_DEFAULT_VALUE) Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, onByDefault ? 1 : 0)
== 1; == 1;
} }