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

am: d490fe0372

Change-Id: I3a88cc331949e987462aca315e7f396d5491147b
This commit is contained in:
Chad Brubaker
2017-04-04 00:31:01 +00:00
committed by android-build-merger

View File

@@ -10324,6 +10324,10 @@ public final class Settings {
INSTANT_APP_SETTINGS.add(DEVELOPMENT_FORCE_RTL);
INSTANT_APP_SETTINGS.add(EPHEMERAL_COOKIE_MAX_SIZE_BYTES);
INSTANT_APP_SETTINGS.add(AIRPLANE_MODE_ON);
INSTANT_APP_SETTINGS.add(WINDOW_ANIMATION_SCALE);
INSTANT_APP_SETTINGS.add(TRANSITION_ANIMATION_SCALE);
INSTANT_APP_SETTINGS.add(ANIMATOR_DURATION_SCALE);
INSTANT_APP_SETTINGS.add(DEBUG_VIEW_ATTRIBUTES);
}
/**