Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose more settings to Instant Apps" into oc-dev

Browse Source 
am: 055b51af28

Change-Id: I1bddeffc290009c2ebf34168dc9ba8b69fe81e98
This commit is contained in:
Chad Brubaker
2017-04-13 00:11:16 +00:00
committed by android-build-merger
parent 33f6bcb71d 055b51af28
commit a927a8c3ba
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/provider/Settings.java
View File

@@ -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);
}
/**
@@ -10331,6 +10333,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);
}
/**