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

Commit 6603f3b9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8746606 from d0ee81b7 to tm-d1-release

Change-Id: I2ae95d8c862b132498b671f13bf58df2eab7a5f9
parents 88421947 d0ee81b7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@
    <string name="action_split" msgid="2098009717623550676">"Split"</string>
    <string name="toast_split_select_app" msgid="5453865907322018352">"Tap another app to use split-screen"</string>
    <string name="toast_split_app_unsupported" msgid="3271526028981899666">"App does not support split-screen."</string>
    <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
    <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organization"</string>
    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"You can find this later in the <xliff:g id="NAME">%1$s</xliff:g> app"</string>
    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@
    <string name="taskbar_edu_switch_apps" msgid="6942863327845784813">"Префрлувајте се меѓу апликации преку лентата за задачи"</string>
    <string name="taskbar_edu_splitscreen" msgid="2663361731630346489">"Повлечете кон страната за да користите две апликации одеднаш"</string>
    <string name="taskbar_edu_stashing" msgid="5212374387411764031">"Допрете и задржете за да се сокрие лентата за задачи"</string>
    <string name="taskbar_edu_next" msgid="4007618274426775841">"Следна"</string>
    <string name="taskbar_edu_next" msgid="4007618274426775841">"Следно"</string>
    <string name="taskbar_edu_previous" msgid="459202320127201702">"Назад"</string>
    <string name="taskbar_edu_close" msgid="887022990168191073">"Затвори"</string>
    <string name="taskbar_edu_done" msgid="6880178093977704569">"Готово"</string>
+15 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ public class TouchInteractionService extends Service
     */
    public class TISBinder extends IOverviewProxy.Stub {

        @Nullable private Runnable mOnOverviewTargetChangeListener = null;

        @BinderThread
        public void onInitialize(Bundle bundle) {
            ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
@@ -327,6 +329,18 @@ public class TouchInteractionService extends Service
        public void setGestureBlockedTaskId(int taskId) {
            mDeviceState.setGestureBlockingTaskId(taskId);
        }

        /** Sets a listener to be run on Overview Target updates. */
        public void setOverviewTargetChangeListener(@Nullable Runnable listener) {
            mOnOverviewTargetChangeListener = listener;
        }

        protected void onOverviewTargetChange() {
            if (mOnOverviewTargetChangeListener != null) {
                mOnOverviewTargetChangeListener.run();
                mOnOverviewTargetChangeListener = null;
            }
        }
    }

    private static boolean sConnected = false;
@@ -487,6 +501,7 @@ public class TouchInteractionService extends Service
        if (newOverviewActivity != null) {
            mTaskbarManager.setActivity(newOverviewActivity);
        }
        mTISBinder.onOverviewTargetChange();
    }

    @UiThread
+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ public class AllSetActivity extends Activity {
        mBinder = binder;
        mBinder.getTaskbarManager().setSetupUIVisible(isResumed());
        mBinder.setSwipeUpProxy(isResumed() ? this::createSwipeUpProxy : null);
        mBinder.setOverviewTargetChangeListener(mBinder::preloadOverviewForSUWAllSet);
        mBinder.preloadOverviewForSUWAllSet();
    }

@@ -218,6 +219,7 @@ public class AllSetActivity extends Activity {
        if (mBinder != null) {
            mBinder.getTaskbarManager().setSetupUIVisible(false);
            mBinder.setSwipeUpProxy(null);
            mBinder.setOverviewTargetChangeListener(null);
        }
    }