diff options
4 files changed, 5 insertions, 20 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 29f13359da5b..a4ea5e81878d 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -844,6 +844,10 @@ <string name="recents_stack_action_button_label">Clear all</string> <!-- Recents: Hint text that shows on the drop targets to start multiwindow. [CHAR LIMIT=NONE] --> <string name="recents_drag_hint_message">Drag here to use split screen</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> + <!-- Recents: Text that shows above the navigation bar after launching several apps. [CHAR LIMIT=NONE] --> + <string name="recents_quick_scrub_onboarding">Drag right to quickly switch apps</string> <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] --> <string name="recents_multistack_add_stack_dialog_split_horizontal">Split Horizontal</string> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl index 4799f398fb7a..f13be73e5c91 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl @@ -36,11 +36,6 @@ interface ISystemUiProxy { void startScreenPinning(int taskId) = 1; /** - * Specifies the text to be shown for onboarding the new swipe-up gesture to access recents. - */ - void setRecentsOnboardingText(CharSequence text) = 3; - - /** * Enables/disables launcher/overview interaction features {@link InteractionType}. */ void setInteractionState(int flags) = 4; diff --git a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java index b1020cfb5a84..3443334e833a 100644 --- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java @@ -78,7 +78,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private IOverviewProxy mOverviewProxy; private int mConnectionBackoffAttempts; - private CharSequence mOnboardingText; private @InteractionType int mInteractionFlags; private boolean mIsEnabled; @@ -119,10 +118,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } } - public void setRecentsOnboardingText(CharSequence text) { - mOnboardingText = text; - } - public void setInteractionState(@InteractionType int flags) { long token = Binder.clearCallingIdentity(); try { @@ -286,10 +281,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis return mOverviewProxy; } - public CharSequence getOnboardingText() { - return mOnboardingText; - } - public int getInteractionFlags() { return mInteractionFlags; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java index 0d8aed4a13f0..901c7aed2aa0 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java @@ -227,12 +227,7 @@ public class RecentsOnboarding { if (!shouldShow()) { return; } - CharSequence onboardingText = mOverviewProxyService.getOnboardingText(); - if (TextUtils.isEmpty(onboardingText)) { - Log.w(TAG, "Unable to get onboarding text"); - return; - } - mTextView.setText(onboardingText); + mTextView.setText(R.string.recents_swipe_up_onboarding); // Only show in portrait. int orientation = mContext.getResources().getConfiguration().orientation; if (!mLayoutAttachedToWindow && orientation == Configuration.ORIENTATION_PORTRAIT) { |