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

Commit c455c990 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge changes Id1278b07,Ic3da5046 into nyc-dev 

am: e45ed153

* commit 'e45ed153':
  Fixed a bug where expanding by touch wasn't possible
  Made sure the fake shadow won't be invisible

Change-Id: I1731894c29c25b83873dbc76fbd917b43d58e5d0
parents 86ac81b6 e45ed153

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

+4 −4
Original line number Diff line number Diff line
@@ -317,8 +317,8 @@ public class ExpandHelper implements Gefingerpoken { 
                    mResizedView = null;

                    mWatchingForPull = false;

                }

                mInitialTouchY = ev.getY();

                mInitialTouchX = ev.getX();

                mInitialTouchY = ev.getRawY();

                mInitialTouchX = ev.getRawX();

                break;



            case MotionEvent.ACTION_CANCEL:
@@ -412,8 +412,8 @@ public class ExpandHelper implements Gefingerpoken { 
                mWatchingForPull = mScrollAdapter != null &&

                        isInside(mScrollAdapter.getHostView(), x, y);

                mResizedView = findView(x, y);

                mInitialTouchX = ev.getX();

                mInitialTouchY = ev.getY();

                mInitialTouchX = ev.getRawX();

                mInitialTouchY = ev.getRawY();

                break;

            case MotionEvent.ACTION_MOVE: {

                if (mWatchingForPull) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/FakeShadowView.java

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.ViewGroup; 
import android.view.ViewOutlineProvider;

import android.widget.LinearLayout;



import com.android.systemui.R;

import com.android.systemui.statusbar.AlphaOptimizedFrameLayout;



/**
@@ -32,6 +33,7 @@ import com.android.systemui.statusbar.AlphaOptimizedFrameLayout; 
 */

public class FakeShadowView extends AlphaOptimizedFrameLayout {

    public static final float SHADOW_SIBLING_TRESHOLD = 0.1f;

    private final int mShadowMinHeight;



    private View mFakeShadow;

    private float mOutlineAlpha;
@@ -64,6 +66,8 @@ public class FakeShadowView extends AlphaOptimizedFrameLayout { 
            }

        });

        addView(mFakeShadow);

        mShadowMinHeight = Math.max(1, context.getResources()

                .getDimensionPixelSize(R.dimen.notification_divider_height));

    }



    public void setFakeShadowTranslationZ(float fakeShadowTranslationZ, float outlineAlpha,
@@ -72,6 +76,7 @@ public class FakeShadowView extends AlphaOptimizedFrameLayout { 
            mFakeShadow.setVisibility(INVISIBLE);

        } else {

            mFakeShadow.setVisibility(VISIBLE);

            fakeShadowTranslationZ = Math.max(mShadowMinHeight, fakeShadowTranslationZ);

            mFakeShadow.setTranslationZ(fakeShadowTranslationZ);

            mFakeShadow.setTranslationX(outlineTranslation);

            mFakeShadow.setTranslationY(shadowYEnd - mFakeShadow.getHeight());