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

Commit 06756f35 authored by Filip Gruszczynski's avatar Filip Gruszczynski
Browse files

Dismiss or cancel in SwipeDismissLayout on screen off. 

Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
parent 35a803be

core/java/com/android/internal/widget/SwipeDismissLayout.java

+18 −13
Original line number Original line Diff line number Diff line
@@ -16,9 +16,11 @@ 




package com.android.internal.widget;

package com.android.internal.widget;





import android.animation.TimeInterpolator;

import android.app.Activity;

import android.app.Activity;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Log;
@@ -28,8 +30,6 @@ import android.view.View; 
import android.view.ViewConfiguration;

import android.view.ViewConfiguration;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.view.ViewTreeObserver;

import android.view.ViewTreeObserver;

import android.view.animation.AccelerateInterpolator;

import android.view.animation.DecelerateInterpolator;

import android.widget.FrameLayout;

import android.widget.FrameLayout;





/**

/**
@@ -62,10 +62,6 @@ public class SwipeDismissLayout extends FrameLayout { 
    // Cached ViewConfiguration and system-wide constant values

    // Cached ViewConfiguration and system-wide constant values

    private int mSlop;

    private int mSlop;

    private int mMinFlingVelocity;

    private int mMinFlingVelocity;

    private int mMaxFlingVelocity;

    private long mAnimationTime;

    private TimeInterpolator mCancelInterpolator;

    private TimeInterpolator mDismissInterpolator;





    // Transient properties

    // Transient properties

    private int mActiveTouchId;

    private int mActiveTouchId;
@@ -92,6 +88,18 @@ public class SwipeDismissLayout extends FrameLayout { 
                    }

                    }

                }

                }

            };

            };

    private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (mDismissed) {

                dismiss();

            } else {

                cancel();

            }

            resetMembers();

        }

    };

    private IntentFilter mScreenOffFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);





    private float mLastX;

    private float mLastX;
@@ -114,11 +122,6 @@ public class SwipeDismissLayout extends FrameLayout { 
        ViewConfiguration vc = ViewConfiguration.get(context);

        ViewConfiguration vc = ViewConfiguration.get(context);

        mSlop = vc.getScaledTouchSlop();

        mSlop = vc.getScaledTouchSlop();

        mMinFlingVelocity = vc.getScaledMinimumFlingVelocity();

        mMinFlingVelocity = vc.getScaledMinimumFlingVelocity();

        mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();

        mAnimationTime = getContext().getResources().getInteger(

                android.R.integer.config_shortAnimTime);

        mCancelInterpolator = new DecelerateInterpolator(1.5f);

        mDismissInterpolator = new AccelerateInterpolator(1.5f);

        TypedArray a = context.getTheme().obtainStyledAttributes(

        TypedArray a = context.getTheme().obtainStyledAttributes(

                com.android.internal.R.styleable.Theme);

                com.android.internal.R.styleable.Theme);

        mUseDynamicTranslucency = !a.hasValue(

        mUseDynamicTranslucency = !a.hasValue(
@@ -141,15 +144,17 @@ public class SwipeDismissLayout extends FrameLayout { 
            getViewTreeObserver().addOnEnterAnimationCompleteListener(

            getViewTreeObserver().addOnEnterAnimationCompleteListener(

                    mOnEnterAnimationCompleteListener);

                    mOnEnterAnimationCompleteListener);

        }

        }

        getContext().registerReceiver(mScreenOffReceiver, mScreenOffFilter);

    }

    }





    @Override

    @Override

    protected void onDetachedFromWindow() {

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        getContext().unregisterReceiver(mScreenOffReceiver);

        if (getContext() instanceof Activity) {

        if (getContext() instanceof Activity) {

            getViewTreeObserver().removeOnEnterAnimationCompleteListener(

            getViewTreeObserver().removeOnEnterAnimationCompleteListener(

                    mOnEnterAnimationCompleteListener);

                    mOnEnterAnimationCompleteListener);

        }

        }

        super.onDetachedFromWindow();

    }

    }





    @Override

    @Override