Merge "Remove RecentsOnboarding" into sc-dev (6a8ca02c) · Commits · e / os / android_frameworks_base

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
		@@ -1047,10 +1047,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
		@@ -82,7 +82,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;
		@@ -164,7 +163,6 @@ public class NavigationBarView extends FrameLayout implements
		private Configuration mTmpLastConfiguration;

		private NavigationBarInflaterView mNavigationInflaterView;
		private RecentsOnboarding mRecentsOnboarding;
		private NotificationPanelViewController mPanelView;
		private RotationContextButton mRotationContextButton;
		private FloatingRotationButton mFloatingRotationButton;
		@@ -323,7 +321,6 @@ public class NavigationBarView extends FrameLayout implements
		updateRotationButton();

		mOverviewProxyService = Dependency.get(OverviewProxyService.class);
		mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService);

		mConfiguration = new Configuration();
		mTmpLastConfiguration = new Configuration();
		@@ -697,7 +694,6 @@ public class NavigationBarView extends FrameLayout implements

		updateNavButtonIcons();
		updateSlippery();
		setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
		updateDisabledSystemUiStateFlags();
		}

		@@ -873,7 +869,6 @@ public class NavigationBarView extends FrameLayout implements
		updateSlippery();
		reloadNavIcons();
		updateNavButtonIcons();
		setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
		WindowManagerWrapper.getInstance().setNavBarVirtualKeyHapticFeedbackEnabled(!showSwipeUpUI);
		getHomeButton().setAccessibilityDelegate(
		showSwipeUpUI ? mQuickStepAccessibilityDelegate : null);
		@@ -917,7 +912,6 @@ public class NavigationBarView extends FrameLayout implements
		mNavBarMode = mode;
		mBarTransitions.onNavigationModeChanged(mNavBarMode);
		mEdgeBackGestureHandler.onNavigationModeChanged(mNavBarMode);
		mRecentsOnboarding.onNavigationModeChanged(mNavBarMode);
		updateRotationButton();

		if (isGesturalMode(mNavBarMode)) {
		@@ -933,10 +927,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();
		@@ -981,7 +971,6 @@ public class NavigationBarView extends FrameLayout implements
		super.onLayout(changed, left, top, right, bottom);

		notifyActiveTouchRegions();
		mRecentsOnboarding.setNavBarHeight(getMeasuredHeight());
		}

		/**
		@@ -1197,7 +1186,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.
		@@ -1261,7 +1249,6 @@ public class NavigationBarView extends FrameLayout implements
		requestApplyInsets();
		reorient();
		onNavigationModeChanged(mNavBarMode);
		setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
		if (mRotationButtonController != null) {
		mRotationButtonController.registerListeners();
		}
		@@ -1277,7 +1264,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();
		}
		@@ -1294,14 +1280,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();
		@@ -1345,7 +1323,6 @@ public class NavigationBarView extends FrameLayout implements
		}
		mBarTransitions.dump(pw);
		mContextualButtonGroup.dump(pw);
		mRecentsOnboarding.dump(pw);
		mRegionSamplingHelper.dump(pw);
		mEdgeBackGestureHandler.dump(pw);
		}