Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f9942df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "a11y_gesture_s-sc-v2-dev" into sc-v2-dev am: ede42318 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15124972

Change-Id: I8d6c0a1842b367db8622f7144fbde02bb2a7fa3c
parents f1f78339 ede42318

core/java/com/android/internal/accessibility/util/AccessibilityStatsLogUtils.java

+16 −4
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.accessibility.util;

package com.android.internal.accessibility.util;





import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE;

import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL;

import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL;

import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;

import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;

import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;

import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
@@ -30,6 +31,7 @@ import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT 
import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_BUTTON;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_BUTTON;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_BUTTON_LONG_PRESS;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_BUTTON_LONG_PRESS;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_FLOATING_MENU;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_FLOATING_MENU;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_GESTURE;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__TRIPLE_TAP;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__TRIPLE_TAP;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__UNKNOWN_TYPE;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__UNKNOWN_TYPE;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__VOLUME_KEY;

import static com.android.internal.util.FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__VOLUME_KEY;
@@ -152,19 +154,29 @@ public final class AccessibilityStatsLogUtils { 
                convertToLoggingMagnificationMode(mode));

                convertToLoggingMagnificationMode(mode));

    }

    }





    private static boolean isFloatingMenuEnabled(Context context) {

    private static boolean isAccessibilityFloatingMenuEnabled(Context context) {

        return Settings.Secure.getInt(context.getContentResolver(),

        return Settings.Secure.getInt(context.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, /* def= */ -1)

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, /* def= */ -1)

                == ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

                == ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

    }

    }





    private static boolean isAccessibilityGestureEnabled(Context context) {

        return Settings.Secure.getInt(context.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, /* def= */ -1)

                == ACCESSIBILITY_BUTTON_MODE_GESTURE;

    }



    private static int convertToLoggingShortcutType(Context context,

    private static int convertToLoggingShortcutType(Context context,

            @ShortcutType int shortcutType) {

            @ShortcutType int shortcutType) {

        switch (shortcutType) {

        switch (shortcutType) {

            case ACCESSIBILITY_BUTTON:

            case ACCESSIBILITY_BUTTON:

                return isFloatingMenuEnabled(context)

                if (isAccessibilityFloatingMenuEnabled(context)) {

                        ? ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_FLOATING_MENU

                    return ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_FLOATING_MENU;

                        : ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_BUTTON;

                } else if (isAccessibilityGestureEnabled(context)) {

                    return ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_GESTURE;

                } else {

                    return ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__A11Y_BUTTON;

                }

            case ACCESSIBILITY_SHORTCUT_KEY:

            case ACCESSIBILITY_SHORTCUT_KEY:

                return ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__VOLUME_KEY;

                return ACCESSIBILITY_SHORTCUT_REPORTED__SHORTCUT_TYPE__VOLUME_KEY;

        }

        }