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

Commit 05c1f854 authored by Tony Wickham's avatar Tony Wickham
Browse files

Get swipe up onboarding text from launcher 

Launcher sends the text when binding to the overview service,
which stores the text for when it needs to be shown.

Also renamed some files and strings to be more generic

Test: install launcher with updated text and ensure it is shown

Bug: 72999860
Change-Id: I5998ab8867754d877f954673e03e5faf44b606ed
parent db96b034

packages/SystemUI/res/layout/recents_swipe_up_onboarding.xml→packages/SystemUI/res/layout/recents_onboarding.xml

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:text="@string/recents_swipe_up_onboarding"

        android:textColor="@android:color/white"

        android:textSize="16sp"

        android:drawableBottom="@drawable/ic_chevron_up"/>

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -842,8 +842,6 @@ 
    <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 nav bar after launching a few apps. [CHAR LIMIT=NONE] -->

    <string name="recents_swipe_up_onboarding">Swipe up to 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

+5 −0
Original line number Diff line number Diff line
@@ -39,4 +39,9 @@ interface ISystemUiProxy { 
     * Called when the overview service has started the recents animation.

     */

    void onRecentsAnimationStarted();



    /**

     * Specifies the text to be shown for onboarding the new swipe-up gesture to access recents.

     */

    void setRecentsOnboardingText(CharSequence text);

}

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

+7 −2
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 


    private IOverviewProxy mOverviewProxy;

    private int mConnectionBackoffAttempts;

    private CharSequence mOnboardingText;



    private ISystemUiProxy mSysUiProxy = new ISystemUiProxy.Stub() {
@@ -105,6 +106,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
                Binder.restoreCallingIdentity(token);

            }

        }



        public void setRecentsOnboardingText(CharSequence text) {

            mOnboardingText = text;

        }

    };



    private final BroadcastReceiver mLauncherAddedReceiver = new BroadcastReceiver() {
@@ -223,8 +228,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        return mOverviewProxy;

    }



    public ComponentName getLauncherComponent() {

        return mLauncherComponentName;

    public CharSequence getOnboardingText() {

        return mOnboardingText;

    }



    private void disconnectFromLauncherService() {

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

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public final class Prefs { 
        Key.QS_NIGHTDISPLAY_ADDED,

        Key.SEEN_MULTI_USER,

        Key.NUM_APPS_LAUNCHED,

        Key.HAS_SWIPED_UP_FOR_RECENTS,

        Key.HAS_SEEN_RECENTS_ONBOARDING,

    })

    public @interface Key {

        @Deprecated
@@ -78,7 +78,7 @@ public final class Prefs { 
        String QS_NIGHTDISPLAY_ADDED = "QsNightDisplayAdded";

        String SEEN_MULTI_USER = "HasSeenMultiUser";

        String NUM_APPS_LAUNCHED = "NumAppsLaunched";

        String HAS_SWIPED_UP_FOR_RECENTS = "HasSwipedUpForRecents";

        String HAS_SEEN_RECENTS_ONBOARDING = "HasSeenRecentsOnboarding";

    }



    public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) {