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

Commit ab7a44b4 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android (Google) Code Review
Browse files

Merge "Delete "Show CPU usage"" into nyc-mr1-dev

parents 8e10f945 fc4a5c2d

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32482,7 +32482,7 @@ package android.provider { 
    field public static final java.lang.String RADIO_CELL = "cell";

    field public static final java.lang.String RADIO_NFC = "nfc";

    field public static final java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";

    field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -35238,7 +35238,7 @@ package android.provider { 
    field public static final java.lang.String RADIO_CELL = "cell";

    field public static final java.lang.String RADIO_NFC = "nfc";

    field public static final java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String THEATER_MODE_ON = "theater_mode_on";

    field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32560,7 +32560,7 @@ package android.provider { 
    field public static final java.lang.String RADIO_CELL = "cell";

    field public static final java.lang.String RADIO_NFC = "nfc";

    field public static final java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";

    field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";

core/java/android/provider/Settings.java

+6 −2
Original line number Diff line number Diff line
@@ -1850,7 +1850,6 @@ public final class Settings { 
            MOVED_TO_GLOBAL.add(Settings.Global.CALL_AUTO_RETRY);

            MOVED_TO_GLOBAL.add(Settings.Global.DEBUG_APP);

            MOVED_TO_GLOBAL.add(Settings.Global.WAIT_FOR_DEBUGGER);

            MOVED_TO_GLOBAL.add(Settings.Global.SHOW_PROCESSES);

            MOVED_TO_GLOBAL.add(Settings.Global.ALWAYS_FINISH_ACTIVITIES);

            MOVED_TO_GLOBAL.add(Settings.Global.TZINFO_UPDATE_CONTENT_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.TZINFO_UPDATE_METADATA_URL);
@@ -2787,7 +2786,8 @@ public final class Settings { 
        /**

         * Control whether the process CPU usage meter should be shown.

         *

         * @deprecated Use {@link Global#SHOW_PROCESSES} instead

         * @deprecated This functionality is no longer available as of

         * {@link android.os.Build.VERSION_CODES#N_MR1}.

         */

        @Deprecated

        public static final String SHOW_PROCESSES = Global.SHOW_PROCESSES;
@@ -8406,7 +8406,11 @@ public final class Settings { 


        /**

         * Control whether the process CPU usage meter should be shown.

         *

         * @deprecated This functionality is no longer available as of

         * {@link android.os.Build.VERSION_CODES#N_MR1}.

         */

        @Deprecated

        public static final String SHOW_PROCESSES = "show_processes";



        /**

packages/SettingsLib/res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -582,11 +582,6 @@ 
    <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->

    <string name="force_rtl_layout_all_locales_summary">Force screen layout direction to RTL for all locales</string>



    <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->

    <string name="show_cpu_usage">Show CPU usage</string>

    <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->

    <string name="show_cpu_usage_summary">Screen overlay showing current CPU usage</string>



    <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->

    <string name="force_hw_ui">Force GPU rendering</string>

    <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->