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

Commit 8e4443e4 authored by Andrew Zeng's avatar Andrew Zeng Committed by Android (Google) Code Review
Browse files

Merge "Add global setting for Wear dynamic color themes"

parents 90e82a06 4d20ded2

core/java/android/provider/Settings.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -18088,6 +18088,14 @@ public final class Settings { 
             * @hide

             * @hide

             */

             */

            public static final int EARLY_UPDATES_STATUS_ABORTED = 4;

            public static final int EARLY_UPDATES_STATUS_ABORTED = 4;














            /**














             * Whether dynamic color theming (e.g. Material You) is enabled for apps which support














             * it.














             *














             * @hide














             */














            public static final String DYNAMIC_COLOR_THEME_ENABLED = "dynamic_color_theme_enabled";











        }







        }











    }







    }









































packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -97,6 +97,7 @@ public class GlobalSettings {









        Settings.Global.Wearable.GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED,







        Settings.Global.Wearable.GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED,











        Settings.Global.Wearable.BATTERY_SAVER_MODE,







        Settings.Global.Wearable.BATTERY_SAVER_MODE,











        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,







        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,











        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER







        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,














        Settings.Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED,











    };







    };











}






}
























packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -352,5 +352,6 @@ public class GlobalSettingsValidators {









                                String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SKIPPED),







                                String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SKIPPED),











                                String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_ABORTED),







                                String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_ABORTED),











                          }));







                          }));














        VALIDATORS.put(Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, BOOLEAN_VALIDATOR);











    }







    }











}






}