openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "Allapps motion changes for landscape"" into ub-launcher3-dorval-polish 

am: 2aab7dc0af

Change-Id: Iedb47256c3847f27c3a702c7da69fb366139c210
This commit is contained in:
Mario Bertschler 2017-05-24 18:18:00 +00:00 committed by android-build-merger
parent 2aea2f3bcb 2aab7dc0af
commit 06cdfb21d7
2 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/gradient_scrim.xml
View File

@ -26,5 +26,6 @@
android:id="@+id/scrim_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
android:visibility="gone"
app:layout_ignoreInsets="true"/>
</merge>

49
src/com/android/launcher3/graphics/ScrimView.java
View File

@ -29,12 +29,10 @@ import android.view.View;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.Interpolator;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
public class ScrimView extends View implements DeviceProfile.LauncherLayoutChangeListener {
public class ScrimView extends View {
private static final boolean DEBUG = false;
@ -59,10 +57,6 @@ public class ScrimView extends View implements DeviceProfile.LauncherLayoutChang
private final Interpolator mAccelerator = new AccelerateInterpolator();
private final Paint mDebugPaint = DEBUG ? new Paint() : null;
private int mPaddingLeft;
private int mPaddingRight;
private int mAlphaStart;
public ScrimView(Context context, AttributeSet attrs) {
super(context, attrs);
mMaskHeight = Utilities.pxFromDp(MASK_HEIGHT_DP, getResources().getDisplayMetrics());
@ -80,21 +74,6 @@ public class ScrimView extends View implements DeviceProfile.LauncherLayoutChang
}
}
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
updatePaddingAndAlphaStart();
Launcher.getLauncher(getContext()).getDeviceProfile()
.addLauncherLayoutChangedListener(this);
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
Launcher.getLauncher(getContext()).getDeviceProfile()
.removeLauncherLayoutChangedListener(this);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@ -112,8 +91,7 @@ public class ScrimView extends View implements DeviceProfile.LauncherLayoutChang
setTranslationY(linTranslationY);
if (APPLY_ALPHA) {
int alpha = mAlphaStart + (int) ((255f - mAlphaStart)
* mAccelerator.getInterpolation(progress));
int alpha = 55 + (int) (200f * mAccelerator.getInterpolation(progress));
mPaint.setAlpha(alpha);
invalidate();
}
@ -121,8 +99,8 @@ public class ScrimView extends View implements DeviceProfile.LauncherLayoutChang
@Override
protected void onDraw(Canvas canvas) {
mAlphaMaskRect.set(mPaddingLeft, 0, getWidth() - mPaddingRight, mMaskHeight);
mFinalMaskRect.set(mPaddingLeft, mMaskHeight, getWidth() - mPaddingRight, getHeight());
mAlphaMaskRect.set(0, 0, getWidth(), mMaskHeight);
mFinalMaskRect.set(0, mMaskHeight, getWidth(), getHeight());
canvas.drawBitmap(sAlphaScrimMask, null, mAlphaMaskRect, mPaint);
canvas.drawBitmap(sFinalScrimMask, null, mFinalMaskRect, mPaint);
@ -133,23 +111,4 @@ public class ScrimView extends View implements DeviceProfile.LauncherLayoutChang
}
}
@Override
public void onLauncherLayoutChanged() {
updatePaddingAndAlphaStart();
invalidate();
}
private void updatePaddingAndAlphaStart() {
DeviceProfile grid = Launcher.getLauncher(getContext()).getDeviceProfile();
if (grid.isVerticalBarLayout()) {
int[] padding = grid.getContainerPadding();
mPaddingLeft = padding[0] + grid.edgeMarginPx;
mPaddingRight = padding[1] + grid.edgeMarginPx;
mAlphaStart = 0;
} else {
mPaddingLeft = 0;
mPaddingRight = 0;
mAlphaStart = 55;
}
}
}