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

Commit 5fafa3cb authored by Doris Ling's avatar Doris Ling
Browse files

resolve merge conflicts of 7eeeb0d9 to master 

Change-Id: I11a7b51612a4cfb98b5776d098ca0ec43a75259b
parents 7edf8335 7eeeb0d9

core/java/android/provider/Settings.java

+4 −1
Original line number Diff line number Diff line
@@ -6466,7 +6466,10 @@ public final class Settings { 
            NIGHT_DISPLAY_CUSTOM_END_TIME,

            NIGHT_DISPLAY_AUTO_MODE,

            NIGHT_DISPLAY_ACTIVATED,

            SYNC_PARENT_SOUNDS

            SYNC_PARENT_SOUNDS,

            CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,

            CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,

            SYSTEM_NAVIGATION_KEYS_ENABLED

        };



        /**