resolved conflicts for merge of 9fc953b9 to ub-launcher3-master (c268148f) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -223,14 +223,12 @@ public class WallpaperCropActivity extends BaseActivity implements Handler.Callb

		@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
		protected boolean isActivityDestroyed() {
		return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
		&& isDestroyed();
		return Utilities.ATLEAST_JB_MR1 && isDestroyed();
		}

		@Thunk void addReusableBitmap(TileSource src) {
		synchronized (mReusableBitmaps) {
		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
		&& src instanceof BitmapRegionTileSource) {
		if (Utilities.ATLEAST_KITKAT && src instanceof BitmapRegionTileSource) {
		Bitmap preview = ((BitmapRegionTileSource) src).getBitmap();
		if (preview != null && preview.isMutable()) {
		mReusableBitmaps.add(preview);

+2 −4

Original line number	Diff line number	Diff line
		@@ -976,10 +976,8 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {

		if (partner == null \|\| !partner.hideDefaultWallpaper()) {
		// Add an entry for the default wallpaper (stored in system resources)
		WallpaperTileInfo defaultWallpaperInfo =
		(Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT)
		? getPreKKDefaultWallpaperInfo()
		: getDefaultWallpaper();
		WallpaperTileInfo defaultWallpaperInfo = Utilities.ATLEAST_KITKAT
		? getDefaultWallpaper() : getPreKKDefaultWallpaperInfo();
		if (defaultWallpaperInfo != null) {
		bundled.add(0, defaultWallpaperInfo);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ public class BubbleTextView extends TextView
		mIcon.setBounds(0, 0, iconSize, iconSize);
		}
		if (mLayoutHorizontal) {
		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
		if (Utilities.ATLEAST_JB_MR1) {
		setCompoundDrawablesRelative(mIcon, null, null, null);
		} else {
		setCompoundDrawables(mIcon, null, null, null);

+4 −4

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ public abstract class ButtonDropTarget extends TextView
		// drawableLeft and drawableStart.
		mDrawable = getResources().getDrawable(resId);

		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
		if (Utilities.ATLEAST_JB_MR1) {
		setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null);
		} else {
		setCompoundDrawablesWithIntrinsicBounds(mDrawable, null, null, null);
		@@ -113,7 +113,7 @@ public abstract class ButtonDropTarget extends TextView
		@Override
		public final void onDragEnter(DragObject d) {
		d.dragView.setColor(mHoverColor);
		if (Utilities.isLmpOrAbove()) {
		if (Utilities.ATLEAST_LOLLIPOP) {
		animateTextColor(mHoverColor);
		} else {
		if (mCurrentFilter == null) {
		@@ -131,7 +131,7 @@ public abstract class ButtonDropTarget extends TextView
		}

		protected void resetHoverColor() {
		if (Utilities.isLmpOrAbove()) {
		if (Utilities.ATLEAST_LOLLIPOP) {
		animateTextColor(mOriginalTextColor.getDefaultColor());
		} else {
		mDrawable.setColorFilter(null);

+3 −3

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class DragView extends View {
		measure(ms, ms);
		mPaint = new Paint(Paint.FILTER_BITMAP_FLAG);

		if (Utilities.isLmpOrAbove()) {
		if (Utilities.ATLEAST_LOLLIPOP) {
		setElevation(getResources().getDimension(R.dimen.drag_elevation));
		}
		}
		@@ -250,14 +250,14 @@ public class DragView extends View {
		setColorScale(color, m2);
		m1.postConcat(m2);

		if (Utilities.isLmpOrAbove()) {
		if (Utilities.ATLEAST_LOLLIPOP) {
		animateFilterTo(m1.getArray());
		} else {
		mPaint.setColorFilter(new ColorMatrixColorFilter(m1));
		invalidate();
		}
		} else {
		if (!Utilities.isLmpOrAbove() \|\| mCurrentFilter == null) {
		if (!Utilities.ATLEAST_LOLLIPOP \|\| mCurrentFilter == null) {
		mPaint.setColorFilter(null);
		invalidate();
		} else {