Fix conflicts

LawnchairLauncher · Jan 8, 2024 · 32922a2 · 32922a2
1 parent 3269857
commit 32922a2
Show file tree

Hide file tree

Showing 25 changed files with 39 additions and 358 deletions.
diff --git a/lawnchair/res/layout/empty_view.xml b/lawnchair/res/layout/empty_view.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView
+<View
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="0dp" />
diff --git a/quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml b/quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -58,133 +58,8 @@
             android:text="@string/home_gesture_tutorial_title"
 
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/guideline"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/gesture_tutorial_menu_back_button">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/gesture_tutorial_home_step_shape"
-                android:scaleType="fitXY"
-                android:adjustViewBounds="true"
-
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <TextView
-                style="@style/TextAppearance.GestureTutorial.MenuButton.Home"
-                android:id="@+id/gesture_tutorial_menu_home_button_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/home_gesture_tutorial_title"
-
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/gesture_tutorial_menu_back_button"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/gesture_tutorial_menu_button_height"
-            android:layout_marginEnd="@dimen/gesture_tutorial_menu_button_spacing"
-            android:layout_marginBottom="24dp"
-            android:background="@drawable/gesture_tutorial_menu_back_button_background"
-            android:clipToOutline="true"
-
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/guideline"
-            app:layout_constraintStart_toEndOf="@id/gesture_tutorial_menu_home_button"
-            app:layout_constraintEnd_toStartOf="@id/gesture_tutorial_menu_overview_button">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/gesture_tutorial_back_step_shape"
-                android:layout_marginBottom="@dimen/gesture_tutorial_menu_back_shape_bottom_margin"
-                android:scaleType="fitXY"
-                android:adjustViewBounds="true"
-
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"/>
-
-            <TextView
-                style="@style/TextAppearance.GestureTutorial.MenuButton.Back"
-                android:id="@+id/gesture_tutorial_menu_back_button_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/back_gesture_tutorial_title"
-
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/gesture_tutorial_menu_overview_button"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/gesture_tutorial_menu_button_height"
-            android:layout_marginBottom="24dp"
-            android:background="@drawable/gesture_tutorial_menu_overview_button_background"
-            android:clipToOutline="true"
-
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/guideline"
-            app:layout_constraintStart_toEndOf="@id/gesture_tutorial_menu_back_button"
-            app:layout_constraintEnd_toEndOf="parent">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/gesture_tutorial_overview_step_shape"
-                android:scaleType="fitXY"
-                android:adjustViewBounds="true"
-
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <TextView
-                style="@style/TextAppearance.GestureTutorial.MenuButton.Overview"
-                android:id="@+id/gesture_tutorial_menu_overview_button_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/overview_gesture_tutorial_title"
-
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-
-            app:layout_constraintGuide_end="@dimen/gesture_tutorial_menu_done_button_spacing"/>
-
-        <Button
-            style="@style/TextAppearance.GestureTutorial.ButtonLabel"
-            android:id="@+id/gesture_tutorial_menu_done_button"
-            android:layout_width="wrap_content"
-            android:layout_height="40dp"
-            android:layout_marginVertical="16dp"
-            android:text="@string/gesture_tutorial_action_button_label"
-            android:background="@drawable/gesture_tutorial_action_button_background"
-            android:backgroundTint="?androidprv:attr/materialColorPrimary"
-            android:stateListAnimator="@null"
-
-            app:layout_constraintTop_toBottomOf="@id/guideline"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -173,12 +173,6 @@ protected void onInvalidSurface() {
         mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener);
     }
 
-    @Override
-    protected void onInvalidSurface() {
-        // Lets wait for surface to become valid again
-        mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener);
-    }
-
     @Override
     public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
         mIgnoreStateChangesDuringMultiWindowAnimation = true;

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.taskbar
 
-import android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR
 import android.graphics.Insets
 import android.graphics.Region
 import android.os.Binder

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -154,63 +154,6 @@ public class TaskbarManager {
         }
     };
 
-    private final ActivityLifecycleCallbacksAdapter mLifecycleCallbacks = new ActivityLifecycleCallbacksAdapter() {
-        @Override
-        public void onActivityDestroyed(Activity activity) {
-            if (mActivity != activity)
-                return;
-            if (mActivity != null) {
-                mActivity.removeOnDeviceProfileChangeListener(
-                        mDebugActivityDeviceProfileChanged);
-                Log.d(TASKBAR_NOT_DESTROYED_TAG,
-                        "unregistering activity lifecycle callbacks from "
-                                + "onActivityDestroyed.");
-                mActivity.unregisterActivityLifecycleCallbacks(this);
-            }
-            mActivity = null;
-            debugWhyTaskbarNotDestroyed("clearActivity");
-            if (mTaskbarActivityContext != null) {
-                mTaskbarActivityContext.setUIController(TaskbarUIController.DEFAULT);
-            }
-            mUnfoldProgressProvider.setSourceProvider(null);
-        }
-    };
-
-    UnfoldTransitionProgressProvider.TransitionProgressListener mUnfoldTransitionProgressListener = new UnfoldTransitionProgressProvider.TransitionProgressListener() {
-        @Override
-        public void onTransitionStarted() {
-            Log.d(TASKBAR_NOT_DESTROYED_TAG,
-                    "fold/unfold transition started getting called.");
-        }
-
-        @Override
-        public void onTransitionProgress(float progress) {
-            Log.d(TASKBAR_NOT_DESTROYED_TAG,
-                    "fold/unfold transition progress : " + progress);
-        }
-
-        @Override
-        public void onTransitionFinishing() {
-            Log.d(TASKBAR_NOT_DESTROYED_TAG,
-                    "fold/unfold transition finishing getting called.");
-
-        }
-
-        @Override
-        public void onTransitionFinished() {
-            Log.d(TASKBAR_NOT_DESTROYED_TAG,
-                    "fold/unfold transition finished getting called.");
-
-        }
-    };
-
-    private final SharedPreferences.OnSharedPreferenceChangeListener
-            mTaskbarPinningPreferenceChangeListener = (sharedPreferences, key) -> {
-                if (TASKBAR_PINNING_KEY.equals(key)) {
-                    recreateTaskbar();
-                }
-            };
-
     private final ActivityLifecycleCallbacksAdapter mLifecycleCallbacks =
             new ActivityLifecycleCallbacksAdapter() {
                 @Override

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -93,6 +93,7 @@
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.OnBackPressedHandler;
 import com.android.launcher3.QuickstepAccessibilityDelegate;
 import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
@@ -759,14 +760,13 @@ protected void registerBackDispatcher() {
 
                     @Override
                     public void onBackStarted(@NonNull BackEvent backEvent) {
-                        if (mActiveOnBackAnimationCallback != null) {
-                            mActiveOnBackAnimationCallback.onBackCancelled();
+                        if (mActiveOnBackPressedHandler != null) {
+                            mActiveOnBackPressedHandler.onBackCancelled();
                         }
-                        mActiveOnBackAnimationCallback = getOnBackAnimationCallback();
-                        mActiveOnBackAnimationCallback.onBackStarted(backEvent);
+                        mActiveOnBackPressedHandler = getOnBackPressedHandler();
+                        mActiveOnBackPressedHandler.onBackStarted();
                     }
 
-                    @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
                     @Override
                     public void onBackInvoked() {
                         // Recreate mActiveOnBackPressedHandler if necessary to avoid NPE
@@ -775,11 +775,11 @@ public void onBackInvoked() {
                         // called on ACTION_DOWN before onBackInvoked() is called in ACTION_UP.
                         // 2. Launcher#onBackPressed() will call onBackInvoked() without calling
                         // onBackInvoked() beforehand.
-                        if (mActiveOnBackAnimationCallback == null) {
-                            mActiveOnBackAnimationCallback = getOnBackAnimationCallback();
+                        if (mActiveOnBackPressedHandler == null) {
+                            mActiveOnBackPressedHandler = getOnBackPressedHandler();
                         }
-                        mActiveOnBackAnimationCallback.onBackInvoked();
-                        mActiveOnBackAnimationCallback = null;
+                        mActiveOnBackPressedHandler.onBackInvoked();
+                        mActiveOnBackPressedHandler = null;
                         TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onBackInvoked");
                     }
                     @Override
@@ -797,8 +797,8 @@ public void onBackCancelled() {
                                 && mActiveOnBackPressedHandler == null) {
                             return;
                         }
-                        mActiveOnBackAnimationCallback.onBackCancelled();
-                        mActiveOnBackAnimationCallback = null;
+                        mActiveOnBackPressedHandler.onBackCancelled();
+                        mActiveOnBackPressedHandler = null;
                     }
                 });
     }

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -178,10 +178,6 @@ private TISBinder(TouchInteractionService tis) {
             mTis = new WeakReference<>(tis);
         }
 
-        private TISBinder(TouchInteractionService tis) {
-            mTis = new WeakReference<>(tis);
-        }
-
         @BinderThread
         public void onInitialize(Bundle bundle) {
             ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(

diff --git a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java
@@ -293,48 +293,4 @@ private void markAsRun() {
             mHasRun = true;
         }
     }
-
-    /**
-     * Class to track the current status of the external transition provider (the events are coming
-     * from the SystemUI side through IPC), it allows to check if the transition has already
-     * finished or currently running on the SystemUI side since last unfold.
-     */
-    private static class TransitionStatusProvider implements TransitionProgressListener {
-
-        private boolean mHasRun = false;
-
-        @Override
-        public void onTransitionStarted() {
-            markAsRun();
-        }
-
-        @Override
-        public void onTransitionProgress(float progress) {
-            markAsRun();
-        }
-
-        @Override
-        public void onTransitionFinished() {
-            markAsRun();
-        }
-
-        /**
-         * Called when the device is folded, so we can reset the status of the animation
-         */
-        public void onFolded() {
-            mHasRun = false;
-        }
-
-        /**
-         * Returns true if there was an animation already (or it is currently running) after
-         * unfolding the device
-         */
-        public boolean hasRun() {
-            return mHasRun;
-        }
-
-        private void markAsRun() {
-            mHasRun = true;
-        }
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -157,7 +157,11 @@ public void initialize(Task task) {
             }
             final long appUsageLimitTimeMs = usageLimit != null ? usageLimit.getTotalUsageLimit() : -1;
             final long appRemainingTimeMs = usageLimit != null ? usageLimit.getUsageRemaining() : -1;
-
+            mTaskView.post(() -> {
+                if (appUsageLimitTimeMs < 0 || appRemainingTimeMs < 0) {
+                    setNoLimit();
+                } else {
+                    setLimit(appUsageLimitTimeMs, appRemainingTimeMs);
                 }
             });
 

diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
@@ -49,7 +49,7 @@
  */
 @TargetApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
 public abstract class AbstractFloatingView extends LinearLayout implements TouchController,
-        OnBackAnimationCallback {
+        OnBackPressedHandler {
 
     @IntDef(flag = true, value = {
             TYPE_COMPOSE_VIEW,
@@ -141,8 +141,6 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public static final int TYPE_TASKBAR_OVERLAYS =
             TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG;
 
-    public static final int TYPE_ALL_EXCEPT_ON_BOARD_POPUP = TYPE_ALL & ~TYPE_ON_BOARD_POPUP;
-
     protected boolean mIsOpen;
 
     public AbstractFloatingView(Context context, AttributeSet attrs) {

diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -181,7 +181,6 @@ protected void onDestroy() {
         super.onDestroy();
         WallpaperManagerCompat.INSTANCE.get(this).removeOnChangeListener(this);
         DisplayController.INSTANCE.get(this).removeChangeListener(this);
-        WallpaperColorHints.get(this).unregisterOnColorsChangedListener(this);
     }
 
     public void runOnceOnStart(Runnable action) {