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

Commit 55bf735e authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Merge "Remove RecentsOnboarding" into sc-dev am: 6a8ca02c am: fba35062 

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

Change-Id: Ib9ef9ce6f64fc38f193c3dcc41a1b97e3cd4fa50
parents 34856c5f fba35062

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -1006,8 +1006,6 @@ 
    <!-- Default name for the media device shown in the output switcher when the name is not available [CHAR LIMIT=30] -->

    <string name="media_seamless_remote_device">Device</string>



    <!-- Recents: Text that shows above the navigation bar after launching a few apps. [CHAR LIMIT=NONE] -->

    <string name="recents_swipe_up_onboarding">Swipe up to switch apps</string>

    <!-- QuickStep: Accessibility to toggle overview [CHAR LIMIT=40] -->

    <string name="quick_step_accessibility_toggle_overview">Toggle Overview</string>

packages/SystemUI/shared/src/com/android/systemui/shared/system/LauncherEventUtil.java

+0 −4
Original line number Diff line number Diff line
@@ -21,8 +21,4 @@ public class LauncherEventUtil { 
    // Constants for the Action

    public static final int VISIBLE = 0;

    public static final int DISMISS = 1;



    // Constants for the Target (View)

    public static final int RECENTS_SWIPE_UP_ONBOARDING_TIP = 0;



}

packages/SystemUI/src/com/android/systemui/Prefs.java

+0 −6
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ public final class Prefs { 
            Key.QS_NIGHTDISPLAY_ADDED,

            Key.QS_LONG_PRESS_TOOLTIP_SHOWN_COUNT,

            Key.SEEN_MULTI_USER,

            Key.HAS_SEEN_RECENTS_SWIPE_UP_ONBOARDING,

            Key.OVERVIEW_OPENED_FROM_HOME_COUNT,

            Key.SEEN_RINGER_GUIDANCE_COUNT,

            Key.QS_HAS_TURNED_OFF_MOBILE_DATA,

            Key.TOUCHED_RINGER_TOGGLE,
@@ -107,10 +105,6 @@ public final class Prefs { 
         */

        String QS_LONG_PRESS_TOOLTIP_SHOWN_COUNT = "QsLongPressTooltipShownCount";

        String SEEN_MULTI_USER = "HasSeenMultiUser";

        String OVERVIEW_OPENED_FROM_HOME_COUNT = "OverviewOpenedFromHomeCount";

        String HAS_SEEN_RECENTS_SWIPE_UP_ONBOARDING = "HasSeenRecentsSwipeUpOnboarding";

        String DISMISSED_RECENTS_SWIPE_UP_ONBOARDING_COUNT =

                "DismissedRecentsSwipeUpOnboardingCount";

        String SEEN_RINGER_GUIDANCE_COUNT = "RingerGuidanceCount";

        String QS_TILE_SPECS_REVEALED = "QsTileSpecsRevealed";

        String QS_HAS_TURNED_OFF_MOBILE_DATA = "QsHasTurnedOffMobileData";

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+0 −4
Original line number Diff line number Diff line
@@ -1027,10 +1027,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    // Returns true if the bar mode is changed.

    private boolean updateBarMode(int barMode) {

        if (mNavigationBarMode != barMode) {

            if (mNavigationBarMode == MODE_TRANSPARENT

                    || mNavigationBarMode == MODE_LIGHTS_OUT_TRANSPARENT) {

                mNavigationBarView.hideRecentsOnboarding();

            }

            mNavigationBarMode = barMode;

            checkNavBarModes();

            if (mAutoHideController != null) {

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+0 −23
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import com.android.systemui.navigationbar.gestural.FloatingRotationButton; 
import com.android.systemui.navigationbar.gestural.RegionSamplingHelper;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsOnboarding;

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

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

import com.android.systemui.shared.system.SysUiStatsLog;
@@ -166,7 +165,6 @@ public class NavigationBarView extends FrameLayout implements 
    private Configuration mTmpLastConfiguration;



    private NavigationBarInflaterView mNavigationInflaterView;

    private RecentsOnboarding mRecentsOnboarding;

    private Optional<Recents> mRecentsOptional = Optional.empty();

    private NotificationPanelViewController mPanelView;

    private RotationContextButton mRotationContextButton;
@@ -335,7 +333,6 @@ public class NavigationBarView extends FrameLayout implements 
        updateRotationButton();



        mOverviewProxyService = Dependency.get(OverviewProxyService.class);

        mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService);



        mConfiguration = new Configuration();

        mTmpLastConfiguration = new Configuration();
@@ -713,7 +710,6 @@ public class NavigationBarView extends FrameLayout implements 


        updateNavButtonIcons();

        updateSlippery();

        setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());

        updateDisabledSystemUiStateFlags();

    }
@@ -889,7 +885,6 @@ public class NavigationBarView extends FrameLayout implements 
        updateSlippery();

        reloadNavIcons();

        updateNavButtonIcons();

        setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());

        WindowManagerWrapper.getInstance().setNavBarVirtualKeyHapticFeedbackEnabled(!showSwipeUpUI);

        getHomeButton().setAccessibilityDelegate(

                showSwipeUpUI ? mQuickStepAccessibilityDelegate : null);
@@ -933,7 +928,6 @@ public class NavigationBarView extends FrameLayout implements 
        mNavBarMode = mode;

        mBarTransitions.onNavigationModeChanged(mNavBarMode);

        mEdgeBackGestureHandler.onNavigationModeChanged(mNavBarMode);

        mRecentsOnboarding.onNavigationModeChanged(mNavBarMode);

        updateRotationButton();



        if (isGesturalMode(mNavBarMode)) {
@@ -949,10 +943,6 @@ public class NavigationBarView extends FrameLayout implements 
        mContextualButtonGroup.setButtonVisibility(R.id.accessibility_button, visible);

    }



    void hideRecentsOnboarding() {

        mRecentsOnboarding.hide(true);

    }



    @Override

    public void onFinishInflate() {

        super.onFinishInflate();
@@ -997,7 +987,6 @@ public class NavigationBarView extends FrameLayout implements 
        super.onLayout(changed, left, top, right, bottom);



        notifyActiveTouchRegions();

        mRecentsOnboarding.setNavBarHeight(getMeasuredHeight());

    }



    /**
@@ -1213,7 +1202,6 @@ public class NavigationBarView extends FrameLayout implements 
        updateIcons(mTmpLastConfiguration);

        updateRecentsIcon();

        mEdgeBackGestureHandler.onConfigurationChanged(mConfiguration);

        mRecentsOnboarding.onConfigurationChanged(mConfiguration);

        if (uiCarModeChanged || mTmpLastConfiguration.densityDpi != mConfiguration.densityDpi

                || mTmpLastConfiguration.getLayoutDirection() != mConfiguration.getLayoutDirection()) {

            // If car mode or density changes, we need to reset the icons.
@@ -1277,7 +1265,6 @@ public class NavigationBarView extends FrameLayout implements 
        requestApplyInsets();

        reorient();

        onNavigationModeChanged(mNavBarMode);

        setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());

        if (mRotationButtonController != null) {

            mRotationButtonController.registerListeners();

        }
@@ -1293,7 +1280,6 @@ public class NavigationBarView extends FrameLayout implements 
    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        Dependency.get(NavigationModeController.class).removeListener(this);

        setUpSwipeUpOnboarding(false);

        for (int i = 0; i < mButtonDispatchers.size(); ++i) {

            mButtonDispatchers.valueAt(i).onDestroy();

        }
@@ -1310,14 +1296,6 @@ public class NavigationBarView extends FrameLayout implements 
                mOnComputeInternalInsetsListener);

    }



    private void setUpSwipeUpOnboarding(boolean connectedToOverviewProxy) {

        if (connectedToOverviewProxy) {

            mRecentsOnboarding.onConnectedToLauncher();

        } else {

            mRecentsOnboarding.onDisconnectedFromLauncher();

        }

    }



    public void dump(PrintWriter pw) {

        final Rect r = new Rect();

        final Point size = new Point();
@@ -1361,7 +1339,6 @@ public class NavigationBarView extends FrameLayout implements 
        }

        mBarTransitions.dump(pw);

        mContextualButtonGroup.dump(pw);

        mRecentsOnboarding.dump(pw);

        mRegionSamplingHelper.dump(pw);

        mEdgeBackGestureHandler.dump(pw);

    }