Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Id1278b07,Ic3da5046 into nyc-dev

Browse Source 
* changes:
  Fixed a bug where expanding by touch wasn't possible
  Made sure the fake shadow won't be invisible
This commit is contained in:
TreeHugger Robot
2016-04-19 22:23:31 +00:00
committed by Android (Google) Code Review
parent dd67b0d525 fe090658b6
commit e45ed15388
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/ExpandHelper.java
View File

@@ -317,8 +317,8 @@ public class ExpandHelper implements Gefingerpoken {
mResizedView = null; mResizedView = null;
mWatchingForPull = false; mWatchingForPull = false;
} }
mInitialTouchY = ev.getY(); mInitialTouchY = ev.getRawY();
mInitialTouchX = ev.getX(); mInitialTouchX = ev.getRawX();
break; break;
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
@@ -412,8 +412,8 @@ public class ExpandHelper implements Gefingerpoken {
mWatchingForPull = mScrollAdapter != null && mWatchingForPull = mScrollAdapter != null &&
isInside(mScrollAdapter.getHostView(), x, y); isInside(mScrollAdapter.getHostView(), x, y);
mResizedView = findView(x, y); mResizedView = findView(x, y);
mInitialTouchX = ev.getX(); mInitialTouchX = ev.getRawX();
mInitialTouchY = ev.getY(); mInitialTouchY = ev.getRawY();
break; break;
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE: {
if (mWatchingForPull) { if (mWatchingForPull) {

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

@@ -25,6 +25,7 @@ import android.view.ViewGroup;
import android.view.ViewOutlineProvider; import android.view.ViewOutlineProvider;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.android.systemui.R;
import com.android.systemui.statusbar.AlphaOptimizedFrameLayout; import com.android.systemui.statusbar.AlphaOptimizedFrameLayout;
/** /**
@@ -32,6 +33,7 @@ import com.android.systemui.statusbar.AlphaOptimizedFrameLayout;
*/ */
public class FakeShadowView extends AlphaOptimizedFrameLayout { public class FakeShadowView extends AlphaOptimizedFrameLayout {
public static final float SHADOW_SIBLING_TRESHOLD = 0.1f; public static final float SHADOW_SIBLING_TRESHOLD = 0.1f;
private final int mShadowMinHeight;
private View mFakeShadow; private View mFakeShadow;
private float mOutlineAlpha; private float mOutlineAlpha;
@@ -64,6 +66,8 @@ public class FakeShadowView extends AlphaOptimizedFrameLayout {
} }
}); });
addView(mFakeShadow); addView(mFakeShadow);
mShadowMinHeight = Math.max(1, context.getResources()
.getDimensionPixelSize(R.dimen.notification_divider_height));
} }
public void setFakeShadowTranslationZ(float fakeShadowTranslationZ, float outlineAlpha, public void setFakeShadowTranslationZ(float fakeShadowTranslationZ, float outlineAlpha,
@@ -72,6 +76,7 @@ public class FakeShadowView extends AlphaOptimizedFrameLayout {
mFakeShadow.setVisibility(INVISIBLE); mFakeShadow.setVisibility(INVISIBLE);
} else { } else {
mFakeShadow.setVisibility(VISIBLE); mFakeShadow.setVisibility(VISIBLE);
fakeShadowTranslationZ = Math.max(mShadowMinHeight, fakeShadowTranslationZ);
mFakeShadow.setTranslationZ(fakeShadowTranslationZ); mFakeShadow.setTranslationZ(fakeShadowTranslationZ);
mFakeShadow.setTranslationX(outlineTranslation); mFakeShadow.setTranslationX(outlineTranslation);
mFakeShadow.setTranslationY(shadowYEnd - mFakeShadow.getHeight()); mFakeShadow.setTranslationY(shadowYEnd - mFakeShadow.getHeight());