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

Commit 68e208c3 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merging ub-launcher3-master, build 5429374 

Test: Manual **

Bug:111926330 [Quickstep 2] Nav bar, gestures, edge-to-edge, and OEM updates
Bug:114136250 Have a more spartan RecentsActivity on android go
Bug:118085499 UI looks different for Contacts widgets in widget screen
Bug:122843905 Polish app opening transition
Bug:126596417 [Gesture Nav] Can't quick switch from home screen
Bug:128129398 Navigation bar should be at the bottom in landscape
Bug:128348746 Gestural Nav enable/disable state should be logged to pixel launcher clearcut logging
Bug:128531133 Make TAPL diagnostics clearer
Bug:129146690 [Gesture Nav] Rounded Corners on Pixel (sailfish) flicker during Quickswitch
Bug:129328259 [Regression] Suspended app icons turn full colour during open animation
Bug:129434166 Lab-only flake: drag to workspace doesn't happen
Bug:129474866 Gesture nav crash: Can't set scaleX to infinity
Bug:129571305 [Fully Gestural Navigation] Go home on swipe up from Recents and App Drawer
Bug:129697378 [Many tests broken, PTL ASAP] "Can't detect navigation mode"Merge branch 'ub-launcher3-master' into merge_5429374
Change-Id: I458c40075bc40d22f658e02ea0673d1de452f3ce
parents bd91b11b 26fa2d2b

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ android_library { 
    ],

    srcs: [

        "tests/tapl/**/*.java",

        "quickstep/src/com/android/quickstep/SwipeUpSetting.java",

        "src/com/android/launcher3/util/SecureSettingsObserver.java",

        "src/com/android/launcher3/TestProtocol.java",

    ],

go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+7 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.launcher3.uioverrides;



import static android.view.View.VISIBLE;



import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;



import android.view.View;
@@ -26,8 +25,12 @@ import com.android.launcher3.Launcher; 
import com.android.launcher3.LauncherStateManager.StateHandler;

import com.android.launcher3.Utilities;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;

import com.android.launcher3.uioverrides.touchcontrollers.LandscapeStatesTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;

import com.android.launcher3.util.TouchController;

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.SysUINavigationMode;

import com.android.quickstep.views.IconRecentsView;



import java.util.ArrayList;
@@ -49,8 +52,8 @@ public abstract class RecentsUiFactory { 
            list.add(new LandscapeStatesTouchController(launcher));

            list.add(new LandscapeEdgeSwipeController(launcher));

        } else {

            boolean allowDragToOverview = OverviewInteractionState.INSTANCE.get(launcher)

                    .isSwipeUpGestureEnabled();

            boolean allowDragToOverview = SysUINavigationMode.INSTANCE.get(launcher)

                    .getMode().hasGestures;

            list.add(new PortraitStatesTouchController(launcher, allowDragToOverview));

        }

        if (FeatureFlags.PULL_DOWN_STATUS_BAR && Utilities.IS_DEBUG_DEVICE

go/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java→go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+14 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.launcher3.uioverrides;

package com.android.launcher3.uioverrides.states;



import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;

import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
@@ -91,4 +91,17 @@ public class OverviewState extends LauncherState { 
    public static float getDefaultSwipeHeight(DeviceProfile dp) {

        return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;

    }





    public static OverviewState newBackgroundState(int id) {

        return new OverviewState(id);

    }



    public static OverviewState newPeekState(int id) {

        return new OverviewState(id);

    }



    public static OverviewState newSwitchState(int id) {

        return new OverviewState(id);

    }

}

go/quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java→go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.uioverrides;

package com.android.launcher3.uioverrides.touchcontrollers;



import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.NORMAL;

go/quickstep/src/com/android/launcher3/uioverrides/PortraitOverviewStateTouchHelper.java→go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.launcher3.uioverrides;

package com.android.launcher3.uioverrides.touchcontrollers;



import android.view.MotionEvent;