Fix issue where scroll container shadow didn't fade out (209a859d) · Commits · e / os / android_packages_apps_Trebuchet

WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {

		@Thunk LinearLayout mWallpapersView;
		@Thunk HorizontalScrollView mWallpaperScrollContainer;
		@Thunk View mWallpaperStrip;

		@Thunk ActionMode.Callback mActionModeCallback;
		@Thunk ActionMode mActionMode;
		@@ -379,6 +380,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {

		mProgressView = findViewById(R.id.loading);
		mWallpaperScrollContainer = (HorizontalScrollView) findViewById(R.id.wallpaper_scroll_container);
		mWallpaperStrip = findViewById(R.id.wallpaper_strip);
		mCropView.setTouchCallback(new CropView.TouchCallback() {
		ViewPropertyAnimator mAnim;
		@Override
		@@ -386,15 +388,15 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
		if (mAnim != null) {
		mAnim.cancel();
		}
		if (mWallpaperScrollContainer.getAlpha() == 1f) {
		if (mWallpaperStrip.getAlpha() == 1f) {
		mIgnoreNextTap = true;
		}
		mAnim = mWallpaperScrollContainer.animate();
		mAnim = mWallpaperStrip.animate();
		mAnim.alpha(0f)
		.setDuration(150)
		.withEndAction(new Runnable() {
		public void run() {
		mWallpaperScrollContainer.setVisibility(View.INVISIBLE);
		mWallpaperStrip.setVisibility(View.INVISIBLE);
		}
		});
		mAnim.setInterpolator(new AccelerateInterpolator(0.75f));
		@@ -412,8 +414,8 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
		if (mAnim != null) {
		mAnim.cancel();
		}
		mWallpaperScrollContainer.setVisibility(View.VISIBLE);
		mAnim = mWallpaperScrollContainer.animate();
		mWallpaperStrip.setVisibility(View.VISIBLE);
		mAnim = mWallpaperStrip.animate();
		mAnim.alpha(1f)
		.setDuration(150)
		.setInterpolator(new DecelerateInterpolator(0.75f));
		@@ -713,10 +715,10 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {

		public void onStop() {
		super.onStop();
		mWallpaperScrollContainer = (HorizontalScrollView) findViewById(R.id.wallpaper_scroll_container);
		if (mWallpaperScrollContainer.getAlpha() < 1f) {
		mWallpaperScrollContainer.setAlpha(1f);
		mWallpaperScrollContainer.setVisibility(View.VISIBLE);
		mWallpaperStrip = findViewById(R.id.wallpaper_strip);
		if (mWallpaperStrip.getAlpha() < 1f) {
		mWallpaperStrip.setAlpha(1f);
		mWallpaperStrip.setVisibility(View.VISIBLE);
		}
		}