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

Commit ea2e735d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move QuickStep onboarding strings from Launcher to SysUI" into pi-dev

parents c5fb960b 0ad27632

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl

+0 −5
Original line number Diff line number Diff line
@@ -35,11 +35,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}.

     */

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

+0 −9
Original line number Diff line number Diff line
@@ -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;

    }

packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java

+1 −6
Original line number Diff line number Diff line
@@ -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) {