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

Commit 361d6da7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Merge Android10 QPR1 into AOSP master"

parents 8021732c 287611f0

AndroidManifest-common.xml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />

    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />





    <!--

OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -10,3 +10,6 @@ mrcasey@google.com 
sunnygoyal@google.com

twickham@google.com

winsonc@google.com



per-file FeatureFlags.java = sunnygoyal@google.com, adamcohen@google.com

per-file BaseFlags.java = sunnygoyal@google.com, adamcohen@google.com

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

+3 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2; 
import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;

import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;



import android.content.Context;

import android.view.View;



import com.android.launcher3.DeviceProfile;
@@ -115,10 +116,10 @@ public class OverviewState extends LauncherState { 
    }



    public static float getDefaultSwipeHeight(Launcher launcher) {

        return getDefaultSwipeHeight(launcher.getDeviceProfile());

        return getDefaultSwipeHeight(launcher, launcher.getDeviceProfile());

    }



    public static float getDefaultSwipeHeight(DeviceProfile dp) {

    public static float getDefaultSwipeHeight(Context context, DeviceProfile dp) {

        return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public final class LandscapeStatesTouchController extends PortraitStatesTouchCon 
    }



    @Override

    protected int getLogContainerTypeForNormalState() {

    protected int getLogContainerTypeForNormalState(MotionEvent ev) {

        return LauncherLogProto.ContainerType.WORKSPACE;

    }

}

go/src/com/android/launcher3/shortcuts/DeepShortcutManager.java

+1 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.Bundle; 
import android.os.UserHandle;



import com.android.launcher3.ItemInfo;

import com.android.launcher3.notification.NotificationKeyData;



import java.util.Collections;

import java.util.List;
@@ -48,10 +49,6 @@ public class DeepShortcutManager { 
    private DeepShortcutManager(Context context) {

    }



    public static boolean supportsShortcuts(ItemInfo info) {

        return false;

    }



    public boolean wasLastCallSuccess() {

        return false;

    }