Merge "Ensure default and remote transition handlers are first" into tm-qpr-dev am: 5d5cae6cc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19538820 Change-Id: I4650e43d11053efcd0b402995e359f865903c9cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -158,9 +158,9 @@ public class Transitions implements RemoteCallable<Transitions> {
|
|||||||
|
|
||||||
private void onInit() {
|
private void onInit() {
|
||||||
// The very last handler (0 in the list) should be the default one.
|
// The very last handler (0 in the list) should be the default one.
|
||||||
mHandlers.add(mDefaultTransitionHandler);
|
mHandlers.add(0, mDefaultTransitionHandler);
|
||||||
// Next lowest priority is remote transitions.
|
// Next lowest priority is remote transitions.
|
||||||
mHandlers.add(mRemoteTransitionHandler);
|
mHandlers.add(1, mRemoteTransitionHandler);
|
||||||
|
|
||||||
ContentResolver resolver = mContext.getContentResolver();
|
ContentResolver resolver = mContext.getContentResolver();
|
||||||
mTransitionAnimationScaleSetting = Settings.Global.getFloat(resolver,
|
mTransitionAnimationScaleSetting = Settings.Global.getFloat(resolver,
|
||||||
|
|||||||
Reference in New Issue
Block a user