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

Commit 3b1026b7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adding "Mobile data" and "Data usage" button in mobile settings."

parents 520d2fc1 21062540

core/java/android/provider/Settings.java

+18 −0
Original line number Diff line number Diff line
@@ -194,6 +194,24 @@ public final class Settings { 
    public static final String ACTION_AIRPLANE_MODE_SETTINGS =

            "android.settings.AIRPLANE_MODE_SETTINGS";



    /**

     * Activity Action: Show mobile data usage list.

     * <p>

     * Input: {@link EXTRA_NETWORK_TEMPLATE} and {@link EXTRA_SUB_ID} should be included to specify

     * how and what mobile data statistics should be collected.

     * <p>

     * Output: Nothing

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MOBILE_DATA_USAGE =

            "android.settings.MOBILE_DATA_USAGE";



    /** @hide */

    public static final String EXTRA_NETWORK_TEMPLATE = "network_template";

    /** @hide */

    public static final String EXTRA_SUB_ID = "sub_id";



    /**

     * Activity Action: Modify Airplane mode settings using a voice command.

     * <p>

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>

        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.READ_SEARCH_INDEXABLES"/>

        <permission name="android.permission.REBOOT"/>

proto/src/metrics_constants.proto

+10 −0
Original line number Diff line number Diff line
@@ -4192,6 +4192,16 @@ message MetricsEvent { 


    // ---- End O-DR1 Constants, all O-DR1 constants go above this line ----



    // ACTION: Settings > Network & Internet > Mobile network > Mobile data

    // CATEGORY: SETTINGS

    // OS: O MR

    ACTION_MOBILE_NETWORK_MOBILE_DATA_TOGGLE = 1081;



    // ACTION: Settings > Network & Internet > Mobile network > Data usage

    // CATEGORY: SETTINGS

    // OS: O MR

    ACTION_MOBILE_NETWORK_DATA_USAGE = 1082;



    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS

  }