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

Commit 25120f02 authored by Alex Salo's avatar Alex Salo Committed by Automerger Merge Worker
Browse files

Merge "Fix long press auto rotate implementation bug" into sc-dev am: 20e43f73 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13777287

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e4e99d23c7d239ceb84e7810276bae7e82c48bf
parents 57e31a1c 20e43f73

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34748,6 +34748,7 @@ package android.provider { 
    field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";

    field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";

    field public static final String ACTION_APP_USAGE_SETTINGS = "android.settings.action.APP_USAGE_SETTINGS";

    field public static final String ACTION_AUTO_ROTATE_SETTINGS = "android.settings.AUTO_ROTATE_SETTINGS";

    field public static final String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";

    field public static final String ACTION_BIOMETRIC_ENROLL = "android.settings.BIOMETRIC_ENROLL";

    field public static final String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -824,6 +824,13 @@ public final class Settings { 
    public static final String ACTION_DISPLAY_SETTINGS =

            "android.settings.DISPLAY_SETTINGS";













    /**













     * Activity Action: Show Auto Rotate configuration settings.













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_AUTO_ROTATE_SETTINGS =













            "android.settings.AUTO_ROTATE_SETTINGS";



























    /**















     * Activity Action: Show settings to allow configuration of Night display.















     * <p>

































packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -71,7 +71,7 @@ public class RotationLockTile extends QSTileImpl<BooleanState> {





























    @Override















    public Intent getLongClickIntent() {













        return new Intent(Settings.ACTION_DISPLAY_SETTINGS);













        return new Intent(Settings.ACTION_AUTO_ROTATE_SETTINGS);















    }































    @Override