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

Commit 01b994ac authored by Ido Ben-Hur's avatar Ido Ben-Hur Committed by Łukasz Patron
Browse files

[SQUASH]base: Revert secondary home handle 

So following navbar mess for hours and thinking how did AOSP messed it this bad.
Apparently they draw a fake navbar for landscape orientation.
The code is broken, I don't know why or how it even got pushed.

These reverts solve "navbar" being drawn in random places on the screen
when activity resumed from recents on landscape, stealing touches while
doing nothing really.

Revert "Show secondary home handle in immersive apps"

This reverts commit 9c84ea1f.

Revert "Draw a fake home handle during QuickSwitch"

This reverts commit 63e92bc0.

Change-Id: I6223247fa2f24466f4497855f80be0faf46dd242
parent 70af95c7

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+1 −198
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; 
import static android.view.InsetsState.containsType;

import static android.view.WindowInsetsController.APPEARANCE_LOW_PROFILE_BARS;

import static android.view.WindowInsetsController.APPEARANCE_OPAQUE_NAVIGATION_BARS;

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

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;



import static com.android.internal.accessibility.common.ShortcutConstants.CHOOSER_PACKAGE_NAME;

import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.NAV_BAR_HANDLE_FORCE_OPAQUE;
@@ -59,9 +57,6 @@ import android.content.IntentFilter; 
import android.content.res.Configuration;

import android.database.ContentObserver;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.graphics.RectF;

import android.hardware.display.DisplayManager;

import android.inputmethodservice.InputMethodService;

import android.net.Uri;

import android.os.Binder;
@@ -77,7 +72,6 @@ import android.telecom.TelecomManager; 
import android.text.TextUtils;

import android.util.Log;

import android.view.Display;

import android.view.Gravity;

import android.view.InsetsState.InternalInsetsType;

import android.view.KeyEvent;

import android.view.LayoutInflater;
@@ -145,7 +139,7 @@ import dagger.Lazy; 
 * on clicks and view states of the nav bar.

 */

public class NavigationBarFragment extends LifecycleFragment implements Callbacks,

        NavigationModeController.ModeChangedListener, DisplayManager.DisplayListener {

        NavigationModeController.ModeChangedListener {



    public static final String TAG = "NavigationBar";

    private static final boolean DEBUG = false;
@@ -211,23 +205,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
    private boolean mIsOnDefaultDisplay;

    public boolean mHomeBlockedThisTouch;



    /**

     * When user is QuickSwitching between apps of different orientations, we'll draw a fake

     * home handle on the orientation they originally touched down to start their swipe

     * gesture to indicate to them that they can continue in that orientation without having to

     * rotate the phone

     * The secondary handle will show when we get

     * {@link OverviewProxyListener#onQuickSwitchToNewTask(int)} callback with the

     * original handle hidden and we'll flip the visibilities once the

     * {@link #mTasksFrozenListener} fires

     */

    private QuickswitchOrientedNavHandle mOrientationHandle;

    private WindowManager.LayoutParams mOrientationParams;

    private int mStartingQuickSwitchRotation = -1;

    private int mCurrentRotation;

    private ViewTreeObserver.OnGlobalLayoutListener mOrientationHandleGlobalLayoutListener;

    private UiEventLogger mUiEventLogger;

    private boolean mShowOrientedHandleForImmersiveMode;



    @com.android.internal.annotations.VisibleForTesting

    public enum NavBarActionEvent implements UiEventLogger.UiEventEnum {
@@ -296,15 +274,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
            mShadeController.collapsePanel(true /* animate */);

        }



        @Override

        public void onQuickSwitchToNewTask(@Surface.Rotation int rotation) {

            mStartingQuickSwitchRotation = rotation;

            if (rotation == -1) {

                mShowOrientedHandleForImmersiveMode = false;

            }

            orientSecondaryHomeHandle();

        }



        @Override

        public void startAssistant(Bundle bundle) {

            mAssistManager.startAssist(bundle);
@@ -346,14 +315,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        }

    };



    private NavigationBarTransitions.DarkIntensityListener mOrientationHandleIntensityListener =

            new NavigationBarTransitions.DarkIntensityListener() {

                @Override

                public void onDarkIntensity(float darkIntensity) {

                    mOrientationHandle.setDarkIntensity(darkIntensity);

                }

            };



    private final Runnable mAutoDim = () -> getBarTransitions().setAutoDim(true);



    private final ContentObserver mAssistContentObserver = new ContentObserver(
@@ -531,8 +492,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
                new AssistHandleViewController(mHandler, mNavigationBarView);

            getBarTransitions().addDarkIntensityListener(mAssistHandlerViewController);

        }



        initSecondaryHomeHandleForRotation();

    }



    @Override
@@ -549,14 +508,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        }

        mOverviewProxyService.removeCallback(mOverviewProxyListener);

        mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);

        if (mOrientationHandle != null) {

            resetSecondaryHandle();

            getContext().getSystemService(DisplayManager.class).unregisterDisplayListener(this);

            getBarTransitions().removeDarkIntensityListener(mOrientationHandleIntensityListener);

            mWindowManager.removeView(mOrientationHandle);

            mOrientationHandle.getViewTreeObserver().removeOnGlobalLayoutListener(

                    mOrientationHandleGlobalLayoutListener);

        }

    }



    @Override
@@ -589,115 +540,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        repositionNavigationBar();

    }



    private void initSecondaryHomeHandleForRotation() {

        if (!canShowSecondaryHandle()) {

            return;

        }



        getContext().getSystemService(DisplayManager.class)

                .registerDisplayListener(this, new Handler(Looper.getMainLooper()));



        mOrientationHandle = new QuickswitchOrientedNavHandle(getContext());

        mOrientationHandle.setId(R.id.secondary_home_handle);



        getBarTransitions().addDarkIntensityListener(mOrientationHandleIntensityListener);

        mOrientationParams = new WindowManager.LayoutParams(0, 0,

                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,

                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                        | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                        | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN

                        | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH

                        | WindowManager.LayoutParams.FLAG_SLIPPERY,

                PixelFormat.TRANSLUCENT);

        mOrientationParams.setTitle("SecondaryHomeHandle" + getContext().getDisplayId());

        mOrientationParams.privateFlags |= PRIVATE_FLAG_NO_MOVE_ANIMATION;

        mWindowManager.addView(mOrientationHandle, mOrientationParams);

        mOrientationHandle.setVisibility(View.GONE);

        mOrientationParams.setFitInsetsTypes(0 /* types*/);

        mOrientationHandleGlobalLayoutListener =

                () -> {

                    if (mStartingQuickSwitchRotation == -1) {

                        return;

                    }



                    RectF boundsOnScreen = mOrientationHandle.computeHomeHandleBounds();

                    mOrientationHandle.mapRectFromViewToScreenCoords(boundsOnScreen, true);

                    Rect boundsRounded = new Rect();

                    boundsOnScreen.roundOut(boundsRounded);

                    mNavigationBarView.setOrientedHandleSamplingRegion(boundsRounded);

                };

        mOrientationHandle.getViewTreeObserver().addOnGlobalLayoutListener(

                mOrientationHandleGlobalLayoutListener);

    }



    private void orientSecondaryHomeHandle() {

        if (!canShowSecondaryHandle()) {

            return;

        }



        if (mStartingQuickSwitchRotation == -1 || mDivider.isDividerVisible()) {

            // Hide the secondary home handle if we are in multiwindow since apps in multiwindow

            // aren't allowed to set the display orientation

            resetSecondaryHandle();

        } else {

            int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation);

            if (mStartingQuickSwitchRotation == -1 || deltaRotation == -1) {

                // Curious if starting quickswitch can change between the if check and our delta

                Log.d(TAG, "secondary nav delta rotation: " + deltaRotation

                        + " current: " + mCurrentRotation

                        + " starting: " + mStartingQuickSwitchRotation);

            }

            int height = 0;

            int width = 0;

            Rect dispSize = mWindowManager.getCurrentWindowMetrics().getBounds();

            mOrientationHandle.setDeltaRotation(deltaRotation);

            switch (deltaRotation) {

                case Surface.ROTATION_90:

                case Surface.ROTATION_270:

                    height = dispSize.height();

                    width = mNavigationBarView.getHeight();

                    break;

                case Surface.ROTATION_180:

                case Surface.ROTATION_0:

                    // TODO(b/152683657): Need to determine best UX for this

                    if (!mShowOrientedHandleForImmersiveMode) {

                        resetSecondaryHandle();

                        return;

                    }

                    width = dispSize.width();

                    height = mNavigationBarView.getHeight();

                    break;

            }



            mOrientationParams.gravity =

                    deltaRotation == Surface.ROTATION_0 ? Gravity.BOTTOM :

                            (deltaRotation == Surface.ROTATION_90 ? Gravity.LEFT : Gravity.RIGHT);

            mOrientationParams.height = height;

            mOrientationParams.width = width;

            mWindowManager.updateViewLayout(mOrientationHandle, mOrientationParams);

            mNavigationBarView.setVisibility(View.GONE);

            mOrientationHandle.setVisibility(View.VISIBLE);

        }

    }



    private void resetSecondaryHandle() {

        if (mOrientationHandle != null) {

            // Case where nav mode is changed w/o ever invoking a quickstep

            // mOrientedHandle is initialized lazily

            mOrientationHandle.setVisibility(View.GONE);

        }

        if (mNavigationBarView != null) {

            mNavigationBarView.setVisibility(View.VISIBLE);

            mNavigationBarView.setOrientedHandleSamplingRegion(null);

        }

    }



    private int deltaRotation(int oldRotation, int newRotation) {

        int delta = newRotation - oldRotation;

        if (delta < 0) delta += 4;

        return delta;

    }



    @Override

    public void dump(String prefix, FileDescriptor fd, PrintWriter pw, String[] args) {

        if (mNavigationBarView != null) {
@@ -708,8 +550,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
            dumpBarTransitions(pw, "mNavigationBarView", mNavigationBarView.getBarTransitions());

        }



        pw.print("  mStartingQuickSwitchRotation=" + mStartingQuickSwitchRotation);

        pw.print("  mCurrentRotation=" + mCurrentRotation);

        pw.print("  mNavigationBarView=");

        if (mNavigationBarView == null) {

            pw.println("null");
@@ -765,11 +605,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
                && mNavigationBarWindowState != state) {

            mNavigationBarWindowState = state;

            updateSystemUiStateFlags(-1);

            mShowOrientedHandleForImmersiveMode = state == WINDOW_STATE_HIDDEN;

            if (mOrientationHandle != null

                    && mStartingQuickSwitchRotation != -1) {

                orientSecondaryHomeHandle();

            }

            if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state));



            if (mNavigationBarView != null) {
@@ -1333,10 +1168,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        mNavBarMode = mode;

        updateScreenPinningGestures();



        if (!canShowSecondaryHandle()) {

            resetSecondaryHandle();

        }



        // Workaround for b/132825155, for secondary users, we currently don't receive configuration

        // changes on overlay package change since SystemUI runs for the system user. In this case,

        // trigger a new configuration change to ensure that the nav bar is updated in the same way.
@@ -1381,34 +1212,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
    private final AccessibilityServicesStateChangeListener mAccessibilityListener =

            this::updateAccessibilityServicesState;



    @Override

    public void onDisplayAdded(int displayId) {



    }



    @Override

    public void onDisplayRemoved(int displayId) {



    }



    @Override

    public void onDisplayChanged(int displayId) {

        if (!canShowSecondaryHandle()) {

            return;

        }



        int rotation = getContext().getResources().getConfiguration()

                .windowConfiguration.getRotation();

        if (rotation != mCurrentRotation) {

            mCurrentRotation = rotation;

            orientSecondaryHomeHandle();

        }

    }



    private boolean canShowSecondaryHandle() {

        return mNavBarMode == NAV_BAR_MODE_GESTURAL;

    }



    private final Consumer<Integer> mRotationWatcher = rotation -> {

        if (mNavigationBarView != null

                && mNavigationBarView.needsReorient(rotation)) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationHandle.java

+3 −3
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ import com.android.systemui.R; 


public class NavigationHandle extends View implements ButtonInterface {



    protected final Paint mPaint = new Paint();

    private final Paint mPaint = new Paint();

    private @ColorInt final int mLightColor;

    private @ColorInt final int mDarkColor;

    protected final int mRadius;

    protected final int mBottom;

    private final int mRadius;

    private final int mBottom;

    private boolean mRequiresInvalidate;



    public NavigationHandle(Context context) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickswitchOrientedNavHandle.java

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

 * Copyright (C) 2019 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.statusbar.phone;



import android.content.Context;

import android.graphics.Canvas;

import android.graphics.RectF;

import android.view.Surface;



import com.android.systemui.R;



/** Temporarily shown view when using QuickSwitch to switch between apps of different rotations */

public class QuickswitchOrientedNavHandle extends NavigationHandle {

    private final int mWidth;

    private final RectF mTmpBoundsRectF = new RectF();

    private @Surface.Rotation int mDeltaRotation;



    public QuickswitchOrientedNavHandle(Context context) {

        super(context);

        mWidth = context.getResources().getDimensionPixelSize(R.dimen.navigation_home_handle_width);

    }



    void setDeltaRotation(@Surface.Rotation int rotation) {

        mDeltaRotation = rotation;

    }



    @Override

    protected void onDraw(Canvas canvas) {

        canvas.drawRoundRect(computeHomeHandleBounds(), mRadius, mRadius, mPaint);

    }



    RectF computeHomeHandleBounds() {

        int left;

        int top;

        int bottom;

        int right;

        int radiusOffset = mRadius * 2;

        int topStart = getLocationOnScreen()[1];



        switch (mDeltaRotation) {

            default:

            case Surface.ROTATION_0:

            case Surface.ROTATION_180:

                int height = mRadius * 2;

                left = getWidth() / 2 - mWidth / 2;

                top = (getHeight() - mBottom - height);

                right = getWidth() / 2 + mWidth / 2;

                bottom = top + height;

                break;

            case Surface.ROTATION_90:

                left = mBottom;

                right = left + radiusOffset;

                top = getHeight() / 2 - (mWidth / 2) - (topStart / 2);

                bottom = top + mWidth;

                break;

            case Surface.ROTATION_270:

                right = getWidth() - mBottom;

                left = right - radiusOffset;

                top = getHeight() / 2 - (mWidth / 2) - (topStart / 2);

                bottom = top + mWidth;

                break;

        }

        mTmpBoundsRectF.set(left, top, right, bottom);

        return mTmpBoundsRectF;

    }

}