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

Commit 08200084 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Added Settings intents" into rvc-dev am: a35a860c am: 84c3b35b

Change-Id: I76f776aecd9b224abb2ab5b0369d8ddb3d6533a1
parents 71291644 84c3b35b
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -1869,6 +1869,24 @@ public final class Settings {
    @UnsupportedAppUsage
    public static final String EXTRA_APP_UID = "app_uid";
    /**
     * Activity Action: Show power menu settings.
     *
     * @hide
     */
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
    public static final String ACTION_POWER_MENU_SETTINGS =
            "android.settings.ACTION_POWER_MENU_SETTINGS";
    /**
     * Activity Action: Show controls settings.
     *
     * @hide
     */
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
    public static final String ACTION_DEVICE_CONTROLS_SETTINGS =
            "android.settings.ACTION_DEVICE_CONTROLS_SETTINGS";
    /**
     * Activity Action: Show a dialog with disabled by policy message.
     * <p> If an user action is disabled by policy, this dialog can be triggered to let
+10 −0
Original line number Diff line number Diff line
@@ -2674,4 +2674,14 @@ enum PageId {
    // CATEGORY: SETTINGS
    // OS: R
    FUELGAUGE_ADVANCED_BATTERY_OPTION = 1842;

    // OPEN: Settings > System > Gestures > Power menu
    // CATEGORY: SETTINGS
    // OS: R
    POWER_MENU_SETTINGS = 1843;

    // OPEN: Settings > System > Gestures > Power menu > Device controls
    // CATEGORY: SETTINGS
    // OS: R
    DEVICE_CONTROLS_SETTINGS = 1844;
}