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

Commit d83f9bd0 authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

Merge changes I92149aed,I01226212 

* changes:
  Remove the legacy implementation of the accessibility floating menu.
  Remove the feature flag of the A11Y_FLOATING_MENU_FLING_SPRING_ANIMATIONS.
parents 73fd79dc 3fe54225

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenu.java

deleted100644 → 0
+0 −277
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.accessibility.floatingmenu;



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

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

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

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

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

import static android.view.accessibility.AccessibilityManager.ACCESSIBILITY_BUTTON;



import static com.android.internal.accessibility.dialog.AccessibilityTargetHelper.getTargets;

import static com.android.systemui.Prefs.Key.HAS_SEEN_ACCESSIBILITY_FLOATING_MENU_DOCK_TOOLTIP;

import static com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenuView.ShapeType;

import static com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenuView.SizeType;



import android.annotation.FloatRange;

import android.content.Context;

import android.database.ContentObserver;

import android.os.Handler;

import android.os.Looper;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.annotation.NonNull;



import com.android.internal.accessibility.dialog.AccessibilityTarget;

import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.Prefs;

import com.android.systemui.shared.system.SysUiStatsLog;

import com.android.systemui.util.settings.SecureSettings;



import java.util.List;



/**

 * Contains logic for an accessibility floating menu view.

 */

public class AccessibilityFloatingMenu implements IAccessibilityFloatingMenu {

    private static final int DEFAULT_FADE_EFFECT_IS_ENABLED = 1;

    private static final int DEFAULT_MIGRATION_TOOLTIP_PROMPT_IS_DISABLED = 0;

    @FloatRange(from = 0.0, to = 1.0)

    private static final float DEFAULT_OPACITY_VALUE = 0.55f;

    @FloatRange(from = 0.0, to = 1.0)

    private static final float DEFAULT_POSITION_X_PERCENT = 1.0f;

    @FloatRange(from = 0.0, to = 1.0)

    private static final float DEFAULT_POSITION_Y_PERCENT = 0.77f;



    private final Context mContext;

    private final SecureSettings mSecureSettings;

    private final AccessibilityFloatingMenuView mMenuView;

    private final MigrationTooltipView mMigrationTooltipView;

    private final DockTooltipView mDockTooltipView;

    private final Handler mHandler = new Handler(Looper.getMainLooper());



    private final ContentObserver mContentObserver =

            new ContentObserver(mHandler) {

                @Override

                public void onChange(boolean selfChange) {

                    mMenuView.onTargetsChanged(getTargets(mContext, ACCESSIBILITY_BUTTON));

                }

            };



    private final ContentObserver mSizeContentObserver =

            new ContentObserver(mHandler) {

                @Override

                public void onChange(boolean selfChange) {

                    mMenuView.setSizeType(getSizeType());

                }

            };



    private final ContentObserver mFadeOutContentObserver =

            new ContentObserver(mHandler) {

                @Override

                public void onChange(boolean selfChange) {

                    mMenuView.updateOpacityWith(isFadeEffectEnabled(),

                            getOpacityValue());

                }

            };



    private final ContentObserver mEnabledA11yServicesContentObserver =

            new ContentObserver(mHandler) {

                @Override

                public void onChange(boolean selfChange) {

                    mMenuView.onEnabledFeaturesChanged();

                }

            };



    public AccessibilityFloatingMenu(Context context, SecureSettings secureSettings) {

        mContext = context;

        mSecureSettings = secureSettings;

        mMenuView = new AccessibilityFloatingMenuView(context, getPosition(context));

        mMigrationTooltipView = new MigrationTooltipView(mContext, mMenuView);

        mDockTooltipView = new DockTooltipView(mContext, mMenuView);

    }



    @VisibleForTesting

    AccessibilityFloatingMenu(Context context, SecureSettings secureSettings,

            AccessibilityFloatingMenuView menuView) {

        mContext = context;

        mSecureSettings = secureSettings;

        mMenuView = menuView;

        mMigrationTooltipView = new MigrationTooltipView(mContext, mMenuView);

        mDockTooltipView = new DockTooltipView(mContext, mMenuView);

    }



    @Override

    public boolean isShowing() {

        return mMenuView.isShowing();

    }



    @Override

    public void show() {

        if (isShowing()) {

            return;

        }

        final List<AccessibilityTarget> targetList = getTargets(mContext, ACCESSIBILITY_BUTTON);

        if (targetList.isEmpty()) {

            return;

        }



        mMenuView.show();

        mMenuView.onTargetsChanged(targetList);

        mMenuView.updateOpacityWith(isFadeEffectEnabled(),

                getOpacityValue());

        mMenuView.setSizeType(getSizeType());

        mMenuView.setShapeType(getShapeType());

        mMenuView.setOnDragEndListener(this::onDragEnd);



        showMigrationTooltipIfNecessary();



        registerContentObservers();

    }



    @Override

    public void hide() {

        if (!isShowing()) {

            return;

        }



        mMenuView.hide();

        mMenuView.setOnDragEndListener(null);

        mMigrationTooltipView.hide();

        mDockTooltipView.hide();



        unregisterContentObservers();

    }



    @NonNull

    private Position getPosition(Context context) {

        final String absolutePositionString = Prefs.getString(context,

                Prefs.Key.ACCESSIBILITY_FLOATING_MENU_POSITION, /* defaultValue= */ null);



        if (TextUtils.isEmpty(absolutePositionString)) {

            return new Position(DEFAULT_POSITION_X_PERCENT, DEFAULT_POSITION_Y_PERCENT);

        } else {

            return Position.fromString(absolutePositionString);

        }

    }



    // Migration tooltip was the android S feature. It's just used on the Android version from R

    // to S. In addition, it only shows once.

    private void showMigrationTooltipIfNecessary() {

        if (isMigrationTooltipPromptEnabled()) {

            mMigrationTooltipView.show();



            mSecureSettings.putInt(

                    ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT, /* disabled */ 0);

        }

    }



    private boolean isMigrationTooltipPromptEnabled() {

        return mSecureSettings.getInt(

                ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT,

                DEFAULT_MIGRATION_TOOLTIP_PROMPT_IS_DISABLED) == /* enabled */ 1;

    }



    private void onDragEnd(Position position) {

        SysUiStatsLog.write(SysUiStatsLog.ACCESSIBILITY_FLOATING_MENU_UI_CHANGED,

                position.getPercentageX(), position.getPercentageY(),

                mContext.getResources().getConfiguration().orientation);

        savePosition(mContext, position);

        showDockTooltipIfNecessary(mContext);

    }



    private void savePosition(Context context, Position position) {

        Prefs.putString(context, Prefs.Key.ACCESSIBILITY_FLOATING_MENU_POSITION,

                position.toString());

    }



    /**

     * Shows tooltip when user drags accessibility floating menu for the first time.

     */

    private void showDockTooltipIfNecessary(Context context) {

        if (!Prefs.get(context).getBoolean(

                HAS_SEEN_ACCESSIBILITY_FLOATING_MENU_DOCK_TOOLTIP, false)) {

            // if the menu is an oval, the user has already dragged it out, so show the tooltip.

            if (mMenuView.isOvalShape()) {

                mDockTooltipView.show();

            }



            Prefs.putBoolean(context, HAS_SEEN_ACCESSIBILITY_FLOATING_MENU_DOCK_TOOLTIP, true);

        }

    }



    private boolean isFadeEffectEnabled() {

        return mSecureSettings.getInt(

                ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,

                DEFAULT_FADE_EFFECT_IS_ENABLED) == /* enabled */ 1;

    }



    private float getOpacityValue() {

        return mSecureSettings.getFloat(

                ACCESSIBILITY_FLOATING_MENU_OPACITY,

                DEFAULT_OPACITY_VALUE);

    }



    private int getSizeType() {

        return mSecureSettings.getInt(

                ACCESSIBILITY_FLOATING_MENU_SIZE, SizeType.SMALL);

    }



    private int getShapeType() {

        return mSecureSettings.getInt(

                ACCESSIBILITY_FLOATING_MENU_ICON_TYPE,

                ShapeType.OVAL);

    }



    private void registerContentObservers() {

        mSecureSettings.registerContentObserverForUser(

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,

                /* notifyForDescendants */ false, mContentObserver,

                UserHandle.USER_CURRENT);

        mSecureSettings.registerContentObserverForUser(

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,

                /* notifyForDescendants */ false, mContentObserver,

                UserHandle.USER_CURRENT);

        mSecureSettings.registerContentObserverForUser(

                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,

                /* notifyForDescendants */ false, mSizeContentObserver,

                UserHandle.USER_CURRENT);

        mSecureSettings.registerContentObserverForUser(

                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,

                /* notifyForDescendants */ false, mFadeOutContentObserver,

                UserHandle.USER_CURRENT);

        mSecureSettings.registerContentObserverForUser(

                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,

                /* notifyForDescendants */ false, mFadeOutContentObserver,

                UserHandle.USER_CURRENT);

        mSecureSettings.registerContentObserverForUser(

                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,

                /* notifyForDescendants */ false,

                mEnabledA11yServicesContentObserver, UserHandle.USER_CURRENT);

    }



    private void unregisterContentObservers() {

        mSecureSettings.unregisterContentObserver(mContentObserver);

        mSecureSettings.unregisterContentObserver(mSizeContentObserver);

        mSecureSettings.unregisterContentObserver(mFadeOutContentObserver);

        mSecureSettings.unregisterContentObserver(

                mEnabledA11yServicesContentObserver);

    }

}

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java

+8 −17
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.systemui.accessibility.floatingmenu; 
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.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;





import static com.android.systemui.flags.Flags.A11Y_FLOATING_MENU_FLING_SPRING_ANIMATIONS;



import android.content.Context;

import android.content.Context;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager;

import android.os.UserHandle;

import android.os.UserHandle;
@@ -38,7 +36,6 @@ import com.android.systemui.accessibility.AccessibilityButtonModeObserver; 
import com.android.systemui.accessibility.AccessibilityButtonModeObserver.AccessibilityButtonMode;

import com.android.systemui.accessibility.AccessibilityButtonModeObserver.AccessibilityButtonMode;

import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver;

import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.util.settings.SecureSettings;

import com.android.systemui.util.settings.SecureSettings;
@@ -59,7 +56,7 @@ public class AccessibilityFloatingMenuController implements 
    private final WindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final DisplayManager mDisplayManager;

    private final DisplayManager mDisplayManager;

    private final AccessibilityManager mAccessibilityManager;

    private final AccessibilityManager mAccessibilityManager;

    private final FeatureFlags mFeatureFlags;



    private final SecureSettings mSecureSettings;

    private final SecureSettings mSecureSettings;

    private final DisplayTracker mDisplayTracker;

    private final DisplayTracker mDisplayTracker;

    @VisibleForTesting

    @VisibleForTesting
@@ -105,7 +102,6 @@ public class AccessibilityFloatingMenuController implements 
            AccessibilityButtonTargetsObserver accessibilityButtonTargetsObserver,

            AccessibilityButtonTargetsObserver accessibilityButtonTargetsObserver,

            AccessibilityButtonModeObserver accessibilityButtonModeObserver,

            AccessibilityButtonModeObserver accessibilityButtonModeObserver,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            FeatureFlags featureFlags,

            SecureSettings secureSettings,

            SecureSettings secureSettings,

            DisplayTracker displayTracker) {

            DisplayTracker displayTracker) {

        mContext = context;

        mContext = context;
@@ -115,7 +111,6 @@ public class AccessibilityFloatingMenuController implements 
        mAccessibilityButtonTargetsObserver = accessibilityButtonTargetsObserver;

        mAccessibilityButtonTargetsObserver = accessibilityButtonTargetsObserver;

        mAccessibilityButtonModeObserver = accessibilityButtonModeObserver;

        mAccessibilityButtonModeObserver = accessibilityButtonModeObserver;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mFeatureFlags = featureFlags;

        mSecureSettings = secureSettings;

        mSecureSettings = secureSettings;

        mDisplayTracker = displayTracker;

        mDisplayTracker = displayTracker;
@@ -162,7 +157,7 @@ public class AccessibilityFloatingMenuController implements 
     * Handles the accessibility floating menu visibility with the given values.

     * Handles the accessibility floating menu visibility with the given values.

     *

     *

     * @param keyguardVisible the keyguard visibility status. Not show the

     * @param keyguardVisible the keyguard visibility status. Not show the

     *                        {@link AccessibilityFloatingMenu} when keyguard appears.

     *                        {@link MenuView} when keyguard appears.

     * @param mode accessibility button mode {@link AccessibilityButtonMode}

     * @param mode accessibility button mode {@link AccessibilityButtonMode}

     * @param targets accessibility button list; it should comes from

     * @param targets accessibility button list; it should comes from

     *                {@link android.provider.Settings.Secure#ACCESSIBILITY_BUTTON_TARGETS}.

     *                {@link android.provider.Settings.Secure#ACCESSIBILITY_BUTTON_TARGETS}.
@@ -187,16 +182,12 @@ public class AccessibilityFloatingMenuController implements 




    private void showFloatingMenu() {

    private void showFloatingMenu() {

        if (mFloatingMenu == null) {

        if (mFloatingMenu == null) {

            if (mFeatureFlags.isEnabled(A11Y_FLOATING_MENU_FLING_SPRING_ANIMATIONS)) {

            final Display defaultDisplay = mDisplayManager.getDisplay(

            final Display defaultDisplay = mDisplayManager.getDisplay(

                    mDisplayTracker.getDefaultDisplayId());

                    mDisplayTracker.getDefaultDisplayId());

            final Context windowContext = mContext.createWindowContext(defaultDisplay,

            final Context windowContext = mContext.createWindowContext(defaultDisplay,

                    TYPE_NAVIGATION_BAR_PANEL, /* options= */ null);

                    TYPE_NAVIGATION_BAR_PANEL, /* options= */ null);

            mFloatingMenu = new MenuViewLayerController(windowContext, mWindowManager,

            mFloatingMenu = new MenuViewLayerController(windowContext, mWindowManager,

                    mAccessibilityManager, mSecureSettings);

                    mAccessibilityManager, mSecureSettings);

            } else {

                mFloatingMenu = new AccessibilityFloatingMenu(mContext, mSecureSettings);

            }

        }

        }





        mFloatingMenu.show();

        mFloatingMenu.show();

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuView.java

deleted100644 → 0
+0 −921

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/BaseTooltipView.java

deleted100644 → 0
+0 −299

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/DockTooltipView.java

deleted100644 → 0
+0 −50
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.accessibility.floatingmenu;



import android.content.Context;



import com.android.systemui.R;



/**

 * Dock tooltip view that shows the info about moving the Accessibility button to the edge to hide.

 */

class DockTooltipView extends BaseTooltipView {

    private final AccessibilityFloatingMenuView mAnchorView;



    DockTooltipView(Context context, AccessibilityFloatingMenuView anchorView) {

        super(context, anchorView);

        mAnchorView = anchorView;



        setDescription(

                getContext().getText(R.string.accessibility_floating_button_docking_tooltip));

    }



    @Override

    void hide() {

        super.hide();



        mAnchorView.stopTranslateXAnimation();

    }



    @Override

    void show() {

        super.show();



        mAnchorView.startTranslateXAnimation();

    }

}