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

Commit 10d82dfb authored by Chris Wren's avatar Chris Wren
Browse files

rename heads up global setting: base part 

Bug: 13208692
Change-Id: Ia020e4d63552ab4b8cbb8a37622c36776800a790
parent c18cd393

core/java/android/provider/Settings.java

+2 −1
Original line number Diff line number Diff line
@@ -6112,7 +6112,8 @@ public final class Settings { 
         *

         * @hide

         */

        public static final String HEADS_UP = "heads_up_enabled";

        public static final String HEADS_UP_NOTIFICATIONS_ENABLED =

                "heads_up_notifications_enabled";



        /** @hide */ public static final int HEADS_UP_OFF = 0;

        /** @hide */ public static final int HEADS_UP_ON = 1;

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        public void onChange(boolean selfChange) {

            boolean wasUsing = mUseHeadsUp;

            mUseHeadsUp = ENABLE_HEADS_UP && Settings.Global.HEADS_UP_OFF != Settings.Global.getInt(

                    mContext.getContentResolver(), Settings.Global.HEADS_UP,

                    mContext.getContentResolver(), Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,

                    Settings.Global.HEADS_UP_OFF);

            mHeadsUpTicker = mUseHeadsUp && 0 != Settings.Global.getInt(

                    mContext.getContentResolver(), SETTING_HEADS_UP_TICKER, 0);
@@ -377,7 +377,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        mHeadsUpObserver.onChange(true); // set up

        if (ENABLE_HEADS_UP) {

            mContext.getContentResolver().registerContentObserver(

                    Settings.Global.getUriFor(Settings.Global.HEADS_UP), true,

                    Settings.Global.getUriFor(Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED), true,

                    mHeadsUpObserver);

            mContext.getContentResolver().registerContentObserver(

                    Settings.Global.getUriFor(SETTING_HEADS_UP_TICKER), true,