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

Commit 6b3ca275 authored by Zaiyue Xue's avatar Zaiyue Xue Committed by Automerger Merge Worker
Browse files

Merge "Define setting name ADAPTIVE_CHARGING_ENABLED." into tm-qpr-dev am:... 

Merge "Define setting name ADAPTIVE_CHARGING_ENABLED." into tm-qpr-dev am: 3ba66c27 am: aa1b2c12

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



Change-Id: I4fa877b44c0696357ad4623db0dd0b18e29df118
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0e0da6f aa1b2c12

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -10922,6 +10922,15 @@ public final class Settings { 
        public static final String LAUNCHER_TASKBAR_EDUCATION_SHOWING =

                "launcher_taskbar_education_showing";













        /**













         * Whether or not adaptive charging feature is enabled by user.













         * Type: int (0 for false, 1 for true)













         * Default: 1













         *













         * @hide













         */













        public static final String ADAPTIVE_CHARGING_ENABLED = "adaptive_charging_enabled";



























        /**















         * These entries are considered common between the personal and the managed profile,















         * since the managed profile doesn't get to change them.