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

Commit ea6f0ae8 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev

parents 7ef4ba61 7c479f5a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -543,10 +543,10 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {

    protected ArrayList<View> createSnapshots(Bundle state, Collection<String> names) {
        int numSharedElements = names.size();
        ArrayList<View> snapshots = new ArrayList<View>(numSharedElements);
        if (numSharedElements == 0) {
            return null;
            return snapshots;
        }
        ArrayList<View> snapshots = new ArrayList<View>(numSharedElements);
        Context context = getWindow().getContext();
        int[] decorLoc = new int[2];
        ViewGroup decorView = getDecor();