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

Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56 am: 48596c45a4

Browse Source 
Change-Id: I98b38e3de8394e9b84d960b3a923aad6b7e47d2e
This commit is contained in:
Menghan Li
2020-04-08 00:11:00 +00:00
committed by Automerger Merge Worker
parent 5e019b9540 48596c45a4
commit ed6d2ac408
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -24,7 +24,6 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OV
import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE; import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING; import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -273,18 +272,10 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
} }
private boolean isAnyServiceSupportAccessibilityButton() { private boolean isAnyServiceSupportAccessibilityButton() {
final AccessibilityManager ams = (AccessibilityManager) getContext().getSystemService( final AccessibilityManager ams = getContext().getSystemService(AccessibilityManager.class);
Context.ACCESSIBILITY_SERVICE); final List<String> targets = ams.getAccessibilityShortcutTargets(
final List<AccessibilityServiceInfo> services = ams.getEnabledAccessibilityServiceList( AccessibilityManager.ACCESSIBILITY_BUTTON);
AccessibilityServiceInfo.FEEDBACK_ALL_MASK); return !targets.isEmpty();
for (AccessibilityServiceInfo info : services) {
if ((info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0) {
return true;
}
}
return false;
} }
private boolean isNavBarMagnificationEnabled() { private boolean isNavBarMagnificationEnabled() {