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

Commit 84089e03 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 4b71e7f7: Merge "Fix visibility propagation check." into lmp-dev 

* commit '4b71e7f7b03844126df844015004f00e8f19afe9':
  Fix visibility propagation check.
parents a1404fd1 cad10680

core/java/android/transition/Visibility.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import android.view.ViewGroup; 
 */

public abstract class Visibility extends Transition {



    private static final String PROPNAME_VISIBILITY = "android:visibility:visibility";

    static final String PROPNAME_VISIBILITY = "android:visibility:visibility";

    private static final String PROPNAME_PARENT = "android:visibility:parent";

    private static final String PROPNAME_SCREEN_LOCATION = "android:visibility:screenLocation";

core/java/android/transition/VisibilityPropagation.java

+5 −1
Original line number Diff line number Diff line
@@ -42,7 +42,11 @@ public abstract class VisibilityPropagation extends TransitionPropagation { 
    @Override

    public void captureValues(TransitionValues values) {

        View view = values.view;

        values.values.put(PROPNAME_VISIBILITY, view.getVisibility());

        Integer visibility = (Integer) values.values.get(Visibility.PROPNAME_VISIBILITY);

        if (visibility == null) {

            visibility = view.getVisibility();

        }

        values.values.put(PROPNAME_VISIBILITY, visibility);

        int[] loc = new int[2];

        view.getLocationOnScreen(loc);

        loc[0] += Math.round(view.getTranslationX());