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

Commit 8f4ac9e2 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Revert "Introduced fading views for the camera interaction on the... 

Merge "Revert "Introduced fading views for the camera interaction on the lockscreen."" into lmp-preview-dev
parents c2c75161 a27b004c

packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java

+0 −5
Original line number Diff line number Diff line
@@ -130,11 +130,6 @@ public class KeyguardStatusView extends GridLayout { 
        }

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;

    }



    private void updateOwnerInfo() {

        String ownerInfo = getOwnerInfo();

        if (!TextUtils.isEmpty(ownerInfo)) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardPageSwipeHelper.java

+6 −44
Original line number Diff line number Diff line
@@ -246,9 +246,7 @@ public class KeyguardPageSwipeHelper { 
    private void startHintTranslationAnimations(float target, long duration,

            Interpolator interpolator) {

        ArrayList<View> targetViews = mCallback.getTranslationViews();

        int length = targetViews.size();

        for (int i = 0; i < length; i++) {

            View targetView = targetViews.get(i);

        for (View targetView : targetViews) {

            targetView.animate()

                    .setDuration(duration)

                    .setInterpolator(interpolator)
@@ -261,16 +259,8 @@ public class KeyguardPageSwipeHelper { 
    }



    private void cancelAnimations() {

        ArrayList<View> translatingViews = mCallback.getTranslationViews();

        int length = translatingViews.size();

        for (int i = 0; i < length; i++) {

            View target = translatingViews.get(i);

            target.animate().cancel();

        }

        ArrayList<View> fadingViews = mCallback.getFadingViews();

        length = fadingViews.size();

        for (int i = 0; i < length; i++) {

            View target = fadingViews.get(i);

        ArrayList<View> targetViews = mCallback.getTranslationViews();

        for (View target : targetViews) {

            target.animate().cancel();

        }

        View targetView = mTranslation > 0 ? mLeftIcon : mRightIcon;
@@ -301,11 +291,6 @@ public class KeyguardPageSwipeHelper { 
        // translation Animation

        startTranslationAnimations(vel, target);



        // fade animations

        if (snapBack) {

            startFadeInAnimations();

        }



        // animate left / right icon

        startIconAnimation(vel, snapBack, target);
@@ -361,20 +346,9 @@ public class KeyguardPageSwipeHelper { 
        mSwipeAnimator = animator;

    }



    private void startFadeInAnimations() {

        ArrayList<View> fadingViews = mCallback.getFadingViews();

        int length = fadingViews.size();

        for (int i = 0; i < length; i++) {

            View targetView = fadingViews.get(i);

            targetView.animate().alpha(1.0f);

        }

    }



    private void startTranslationAnimations(float vel, float target) {

        ArrayList<View> targetViews = mCallback.getTranslationViews();

        int length = targetViews.size();

        for (int i = 0; i < length; i++) {

            View targetView = targetViews.get(i);

        for (View targetView : targetViews) {

            ViewPropertyAnimator animator = targetView.animate();

            mFlingAnimationUtils.apply(animator, mTranslation, target, vel);

            animator.translationX(target);
@@ -401,18 +375,8 @@ public class KeyguardPageSwipeHelper { 
        translation = leftSwipePossible() ? translation : Math.min(0, translation);

        if (translation != mTranslation || isReset) {

            ArrayList<View> translatedViews = mCallback.getTranslationViews();

            int length = translatedViews.size();

            for (int i = 0; i < length; i++) {

                View target = translatedViews.get(i);

                target.setTranslationX(translation);

            }

            float targetAlpha = 1.0f - Math.abs(translation / mMinTranslationAmount);

            targetAlpha = Math.max(0.0f, targetAlpha);

            ArrayList<View> fadingViews = mCallback.getFadingViews();

            length = fadingViews.size();

            for (int i = 0; i < length; i++) {

                View view = fadingViews.get(i);

                view.setAlpha(targetAlpha);

            for (View view : translatedViews) {

                view.setTranslationX(translation);

            }

            if (translation == 0.0f) {

                boolean animate = !isReset;
@@ -530,8 +494,6 @@ public class KeyguardPageSwipeHelper { 


        ArrayList<View> getTranslationViews();



        ArrayList<View> getFadingViews();



        View getLeftIcon();



        View getCenterIcon();

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+1 −7
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ public class NotificationPanelView extends PanelView implements 
    private KeyguardBottomAreaView mKeyguardBottomArea;

    private boolean mBlockTouches;

    private ArrayList<View> mSwipeTranslationViews = new ArrayList<>();

    private ArrayList<View> mSwipeFadingViews = new ArrayList<>();



    public NotificationPanelView(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -153,7 +152,7 @@ public class NotificationPanelView extends PanelView implements 
                android.R.interpolator.fast_out_linear_in);

        mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area);

        mSwipeTranslationViews.add(mNotificationStackScroller);

        mSwipeFadingViews.add(mKeyguardStatusView);

        mSwipeTranslationViews.add(mKeyguardStatusView);

        mPageSwiper = new KeyguardPageSwipeHelper(this, getContext());

    }
@@ -958,11 +957,6 @@ public class NotificationPanelView extends PanelView implements 
        return mSwipeTranslationViews;

    }



    @Override

    public ArrayList<View> getFadingViews() {

        return mSwipeFadingViews;

    }



    @Override

    public View getLeftIcon() {

        return getLayoutDirection() == LAYOUT_DIRECTION_RTL