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

Commit 9e6bb311 authored by Chad Brubaker's avatar Chad Brubaker Committed by android-build-merger
Browse files

Merge "Expose more settings to Instant Apps" into oc-dev am: 055b51af 

am: a927a8c3

Change-Id: I3224b23298ad06cd6a75ae1a5d96f0690c7bccf3
parents dc4792c1 a927a8c3

core/java/android/provider/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -4125,6 +4125,7 @@ public final class Settings { 
            INSTANT_APP_SETTINGS.add(HAPTIC_FEEDBACK_ENABLED);

            INSTANT_APP_SETTINGS.add(TIME_12_24);

            INSTANT_APP_SETTINGS.add(SOUND_EFFECTS_ENABLED);

            INSTANT_APP_SETTINGS.add(ACCELEROMETER_ROTATION);

        }



        /**
@@ -7094,6 +7095,7 @@ public final class Settings { 
            INSTANT_APP_SETTINGS.add(ANDROID_ID);



            INSTANT_APP_SETTINGS.add(PACKAGE_VERIFIER_USER_CONSENT);

            INSTANT_APP_SETTINGS.add(ALLOW_MOCK_LOCATION);

        }



        /**
@@ -10339,6 +10341,7 @@ public final class Settings { 
            INSTANT_APP_SETTINGS.add(TRANSITION_ANIMATION_SCALE);

            INSTANT_APP_SETTINGS.add(ANIMATOR_DURATION_SCALE);

            INSTANT_APP_SETTINGS.add(DEBUG_VIEW_ATTRIBUTES);

            INSTANT_APP_SETTINGS.add(WTF_IS_FATAL);

        }



        /**