@nativescript/core 9.0.0-next-10-06-2025-18277360121 → 9.0.0-next-10-09-2025-18367604937

package/platforms/android/java/org/nativescript/widgets/CommonLayoutParams.java

@@ -1,456 +0,0 @@
-/**
- *
- */
-package org.nativescript.widgets;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.MeasureSpec;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.FrameLayout;
-
-/**
- * @author hhristov
- */
-public class CommonLayoutParams extends FrameLayout.LayoutParams {
-
-	static final String TAG = "NSLayout";
-	static int debuggable = -1;
-	private static final int NOT_SET = Integer.MIN_VALUE;
-	private static final StringBuilder sb = new StringBuilder();
-
-	public CommonLayoutParams() {
-		super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, Gravity.FILL);
-	}
-
-	public CommonLayoutParams(ViewGroup.LayoutParams source) {
-		super(source);
-	}
-
-	public CommonLayoutParams(ViewGroup.MarginLayoutParams source) {
-		super(source);
-	}
-
-	public CommonLayoutParams(FrameLayout.LayoutParams source) {
-		super((ViewGroup.MarginLayoutParams) source);
-		this.gravity = source.gravity;
-	}
-
-	public CommonLayoutParams(CommonLayoutParams source) {
-		this((FrameLayout.LayoutParams) source);
-
-		this.widthPercent = source.widthPercent;
-		this.heightPercent = source.heightPercent;
-
-		this.topMargin = source.topMargin;
-		this.leftMargin = source.leftMargin;
-		this.bottomMargin = source.bottomMargin;
-		this.rightMargin = source.rightMargin;
-
-		this.left = source.left;
-		this.top = source.top;
-		this.row = source.row;
-		this.column = source.column;
-		this.rowSpan = source.rowSpan;
-		this.columnSpan = source.columnSpan;
-		this.dock = source.dock;
-	}
-
-	public float widthPercent = 0;
-	public float heightPercent = 0;
-
-	public float topMarginPercent = 0;
-	public float leftMarginPercent = 0;
-	public float bottomMarginPercent = 0;
-	public float rightMarginPercent = 0;
-
-	public int widthOriginal = NOT_SET;
-	public int heightOriginal = NOT_SET;
-
-	public int topMarginOriginal = NOT_SET;
-	public int leftMarginOriginal = NOT_SET;
-	public int bottomMarginOriginal = NOT_SET;
-	public int rightMarginOriginal = NOT_SET;
-
-	public int left = 0;
-	public int top = 0;
-	public int row = 0;
-	public int column = 0;
-	public int rowSpan = 1;
-	public int columnSpan = 1;
-	public Dock dock = Dock.left;
-
-	protected static int getDesiredWidth(View view) {
-		CommonLayoutParams lp = (CommonLayoutParams) view.getLayoutParams();
-		return view.getMeasuredWidth() + lp.leftMargin + lp.rightMargin;
-	}
-
-	protected static int getDesiredHeight(View view) {
-		CommonLayoutParams lp = (CommonLayoutParams) view.getLayoutParams();
-		return view.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;
-	}
-
-	// We use our own layout method because the one in FrameLayout is broken when margins are set and gravity is CENTER_VERTICAL or CENTER_HORIZONTAL.
-	@SuppressLint("RtlHardcoded")
-	protected static void layoutChild(View child, int left, int top, int right, int bottom) {
-		if (child == null || child.getVisibility() == View.GONE) {
-			return;
-		}
-
-		int childTop = 0;
-		int childLeft = 0;
-
-		int childWidth = child.getMeasuredWidth();
-		int childHeight = child.getMeasuredHeight();
-
-		CommonLayoutParams lp = (CommonLayoutParams) child.getLayoutParams();
-		int gravity = lp.gravity;
-		if (gravity == -1) {
-			gravity = Gravity.FILL;
-		}
-
-		int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;
-
-		// If we have explicit height and gravity is FILL we need to be centered otherwise our explicit height won't be taken into account.
-		if ((lp.height >= 0 || lp.heightPercent > 0) && verticalGravity == Gravity.FILL_VERTICAL) {
-			verticalGravity = Gravity.CENTER_VERTICAL;
-		}
-
-		switch (verticalGravity) {
-			case Gravity.TOP:
-				childTop = top + lp.topMargin;
-				break;
-
-			case Gravity.CENTER_VERTICAL:
-				childTop = top + (bottom - top - childHeight + lp.topMargin - lp.bottomMargin) / 2;
-				break;
-
-			case Gravity.BOTTOM:
-				childTop = bottom - childHeight - lp.bottomMargin;
-				break;
-
-			case Gravity.FILL_VERTICAL:
-			default:
-				childTop = top + lp.topMargin;
-				childHeight = bottom - top - (lp.topMargin + lp.bottomMargin);
-				break;
-		}
-
-		int horizontalGravity = Gravity.getAbsoluteGravity(gravity, child.getLayoutDirection()) & Gravity.HORIZONTAL_GRAVITY_MASK;
-
-		// If we have explicit width and gravity is FILL we need to be centered otherwise our explicit width won't be taken into account.
-		if ((lp.width >= 0 || lp.widthPercent > 0) && horizontalGravity == Gravity.FILL_HORIZONTAL) {
-			horizontalGravity = Gravity.CENTER_HORIZONTAL;
-		}
-
-		switch (horizontalGravity) {
-			case Gravity.LEFT:
-				childLeft = left + lp.leftMargin;
-				break;
-
-			case Gravity.CENTER_HORIZONTAL:
-				childLeft = left + (right - left - childWidth + lp.leftMargin - lp.rightMargin) / 2;
-				break;
-
-			case Gravity.RIGHT:
-				childLeft = right - childWidth - lp.rightMargin;
-				break;
-
-			case Gravity.FILL_HORIZONTAL:
-			default:
-				childLeft = left + lp.leftMargin;
-				childWidth = right - left - (lp.leftMargin + lp.rightMargin);
-				break;
-		}
-
-		int childRight = Math.round(childLeft + childWidth);
-		int childBottom = Math.round(childTop + childHeight);
-		childLeft = Math.round(childLeft);
-		childTop = Math.round(childTop);
-
-		// Re-measure TextView because it is not centered if layout width is larger than measure width.
-		if (child instanceof android.widget.TextView) {
-
-			boolean canChangeWidth = lp.width < 0;
-			boolean canChangeHeight = lp.height < 0;
-
-			int measuredWidth = child.getMeasuredWidth();
-			int measuredHeight = child.getMeasuredHeight();
-
-			int width = childRight - childLeft;
-			int height = childBottom - childTop;
-			if ((Math.abs(measuredWidth - width) > 1 && canChangeWidth) || (Math.abs(measuredHeight - height) > 1 && canChangeHeight)) {
-				int widthMeasureSpec = MeasureSpec.makeMeasureSpec(canChangeWidth ? width : lp.width, MeasureSpec.EXACTLY);
-				int heightMeasureSpec = MeasureSpec.makeMeasureSpec(canChangeHeight ? height : lp.height, MeasureSpec.EXACTLY);
-				if (debuggable > 0) {
-					sb.setLength(0);
-					sb.append("remeasure ");
-					sb.append(child);
-					sb.append(" with ");
-					sb.append(MeasureSpec.toString(widthMeasureSpec));
-					sb.append(", ");
-					sb.append(MeasureSpec.toString(heightMeasureSpec));
-					log(TAG, sb.toString());
-				}
-
-				child.measure(widthMeasureSpec, heightMeasureSpec);
-			}
-		}
-
-		if (debuggable > 0) {
-			sb.setLength(0);
-			sb.append(child.getParent().toString());
-			sb.append(" :layoutChild: ");
-			sb.append(child);
-			sb.append(" ");
-			sb.append(childLeft);
-			sb.append(", ");
-			sb.append(childTop);
-			sb.append(", ");
-			sb.append(childRight);
-			sb.append(", ");
-			sb.append(childBottom);
-			log(TAG, sb.toString());
-		}
-
-		child.layout(childLeft, childTop, childRight, childBottom);
-	}
-
-	protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
-		if (child == null || child.getVisibility() == View.GONE) {
-			return;
-		}
-
-		// Negative means not initialized.
-		if (debuggable < 0) {
-			try {
-				Context context = child.getContext();
-				ApplicationInfo ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), android.content.pm.PackageManager.GET_META_DATA);
-				android.os.Bundle bundle = ai.metaData;
-				Boolean debugLayouts = bundle != null && bundle.getBoolean("debugLayouts", false);
-				debuggable = debugLayouts ? 1 : 0;
-			} catch (NameNotFoundException e) {
-				debuggable = 0;
-				Log.e(TAG, "Failed to load meta-data, NameNotFound: " + e.getMessage());
-			} catch (NullPointerException e) {
-				debuggable = 0;
-				Log.e(TAG, "Failed to load meta-data, NullPointer: " + e.getMessage());
-			}
-		}
-
-		int childWidthMeasureSpec = getMeasureSpec(child, widthMeasureSpec, true);
-		int childHeightMeasureSpec = getMeasureSpec(child, heightMeasureSpec, false);
-
-		if (debuggable > 0) {
-			sb.setLength(0);
-			sb.append(child.getParent().toString());
-			sb.append(" :measureChild: ");
-			sb.append(child);
-			sb.append(" ");
-			sb.append(MeasureSpec.toString(childWidthMeasureSpec));
-			sb.append(", ");
-			sb.append(MeasureSpec.toString(childHeightMeasureSpec));
-			log(TAG, sb.toString());
-		}
-
-		child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
-	}
-
-	/**
-	 * Iterates over children and changes their width and height to one calculated from percentage
-	 * values.
-	 *
-	 * @param viewGroup         The parent ViewGroup.
-	 * @param widthMeasureSpec  Width MeasureSpec of the parent ViewGroup.
-	 * @param heightMeasureSpec Height MeasureSpec of the parent ViewGroup.
-	 */
-	protected static void adjustChildrenLayoutParams(ViewGroup viewGroup, int widthMeasureSpec, int heightMeasureSpec) {
-
-		int availableWidth = MeasureSpec.getSize(widthMeasureSpec);
-		int widthSpec = MeasureSpec.getMode(widthMeasureSpec);
-
-		int availableHeight = MeasureSpec.getSize(heightMeasureSpec);
-		int heightSpec = MeasureSpec.getMode(heightMeasureSpec);
-
-		for (int i = 0, count = viewGroup.getChildCount(); i < count; i++) {
-			View child = viewGroup.getChildAt(i);
-			LayoutParams params = child.getLayoutParams();
-
-			if (params instanceof CommonLayoutParams) {
-				CommonLayoutParams lp = (CommonLayoutParams) child.getLayoutParams();
-				if (widthSpec != MeasureSpec.UNSPECIFIED) {
-					if (lp.widthPercent > 0) {
-						// If we get measured twice we will override the original value with the one calculated from percentValue from the first measure.
-						// So we set originalValue only the first time.
-						if (lp.widthOriginal == NOT_SET) {
-							lp.widthOriginal = lp.width;
-						}
-						lp.width = (int) (availableWidth * lp.widthPercent);
-					} else {
-						lp.widthOriginal = NOT_SET;
-					}
-
-					if (lp.leftMarginPercent > 0) {
-						if (lp.leftMarginOriginal == NOT_SET) {
-							lp.leftMarginOriginal = lp.leftMargin;
-						}
-						lp.leftMargin = (int) (availableWidth * lp.leftMarginPercent);
-					} else {
-						lp.leftMarginOriginal = NOT_SET;
-					}
-
-					if (lp.rightMarginPercent > 0) {
-						if (lp.rightMarginOriginal == NOT_SET) {
-							lp.rightMarginOriginal = lp.rightMargin;
-						}
-						lp.rightMargin = (int) (availableWidth * lp.rightMarginPercent);
-					} else {
-						lp.rightMarginOriginal = NOT_SET;
-					}
-				}
-
-				if (heightSpec != MeasureSpec.UNSPECIFIED) {
-					if (lp.heightPercent > 0) {
-						if (lp.heightOriginal == NOT_SET) {
-							lp.heightOriginal = lp.height;
-						}
-						lp.height = (int) (availableHeight * lp.heightPercent);
-					} else {
-						lp.heightOriginal = NOT_SET;
-					}
-
-					if (lp.topMarginPercent > 0) {
-						if (lp.topMarginOriginal == NOT_SET) {
-							lp.topMarginOriginal = lp.topMargin;
-						}
-						lp.topMargin = (int) (availableHeight * lp.topMarginPercent);
-					} else {
-						lp.topMarginOriginal = NOT_SET;
-					}
-
-					if (lp.bottomMarginPercent > 0) {
-						if (lp.bottomMarginOriginal == NOT_SET) {
-							lp.bottomMarginOriginal = lp.bottomMargin;
-						}
-						lp.bottomMargin = (int) (availableHeight * lp.bottomMarginPercent);
-					} else {
-						lp.bottomMarginOriginal = NOT_SET;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Iterates over children and restores their original dimensions that were changed for
-	 * percentage values.
-	 */
-	protected static void restoreOriginalParams(ViewGroup viewGroup) {
-		for (int i = 0, count = viewGroup.getChildCount(); i < count; i++) {
-			View view = viewGroup.getChildAt(i);
-			LayoutParams params = view.getLayoutParams();
-			if (params instanceof CommonLayoutParams) {
-				CommonLayoutParams lp = (CommonLayoutParams) params;
-				if (lp.widthPercent > 0) {
-					lp.width = lp.widthOriginal;
-				}
-				if (lp.heightPercent > 0) {
-					lp.height = lp.heightOriginal;
-				}
-				if (lp.leftMarginPercent > 0) {
-					lp.leftMargin = lp.leftMarginOriginal;
-				}
-				if (lp.topMarginPercent > 0) {
-					lp.topMargin = lp.topMarginOriginal;
-				}
-				if (lp.rightMarginPercent > 0) {
-					lp.rightMargin = lp.rightMarginOriginal;
-				}
-				if (lp.bottomMarginPercent > 0) {
-					lp.bottomMargin = lp.bottomMarginOriginal;
-				}
-
-				lp.widthOriginal = NOT_SET;
-				lp.heightOriginal = NOT_SET;
-				lp.leftMarginOriginal = NOT_SET;
-				lp.topMarginOriginal = NOT_SET;
-				lp.rightMarginOriginal = NOT_SET;
-				lp.bottomMarginOriginal = NOT_SET;
-			}
-		}
-	}
-
-	static void log(String tag, String message) {
-		Log.v(tag, message);
-	}
-
-	static StringBuilder getStringBuilder() {
-		sb.setLength(0);
-		return sb;
-	}
-
-	private static int getMeasureSpec(View view, int parentMeasureSpec, boolean horizontal) {
-
-		int parentLength = MeasureSpec.getSize(parentMeasureSpec);
-		int parentSpecMode = MeasureSpec.getMode(parentMeasureSpec);
-
-		CommonLayoutParams lp = (CommonLayoutParams) view.getLayoutParams();
-		final int margins = horizontal ? lp.leftMargin + lp.rightMargin : lp.topMargin + lp.bottomMargin;
-
-		int resultSize = 0;
-		int resultMode = MeasureSpec.UNSPECIFIED;
-
-		int measureLength = Math.max(0, parentLength - margins);
-		int childLength = horizontal ? lp.width : lp.height;
-
-		// We want a specific size... let be it.
-		if (childLength >= 0) {
-			if (parentSpecMode != MeasureSpec.UNSPECIFIED) {
-				resultSize = Math.min(parentLength, childLength);
-			} else {
-				resultSize = childLength;
-			}
-
-			resultMode = MeasureSpec.EXACTLY;
-		} else {
-			switch (parentSpecMode) {
-				// Parent has imposed an exact size on us
-				case MeasureSpec.EXACTLY:
-					resultSize = measureLength;
-					int gravity = LayoutBase.getGravity(view);
-					boolean stretched;
-					if (horizontal) {
-						final int horizontalGravity = Gravity.getAbsoluteGravity(gravity, view.getLayoutDirection()) & Gravity.HORIZONTAL_GRAVITY_MASK;
-						stretched = horizontalGravity == Gravity.FILL_HORIZONTAL;
-					} else {
-						final int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;
-						stretched = verticalGravity == Gravity.FILL_VERTICAL;
-					}
-
-					// if stretched - view wants to be our size. So be it.
-					// else - view wants to determine its own size. It can't be bigger than us.
-					resultMode = stretched ? MeasureSpec.EXACTLY : MeasureSpec.AT_MOST;
-					break;
-
-				// Parent has imposed a maximum size on us
-				case MeasureSpec.AT_MOST:
-					resultSize = measureLength;
-					resultMode = MeasureSpec.AT_MOST;
-					break;
-
-				case MeasureSpec.UNSPECIFIED:
-					resultSize = 0;
-					resultMode = MeasureSpec.UNSPECIFIED;
-					break;
-			}
-		}
-
-		return MeasureSpec.makeMeasureSpec(resultSize, resultMode);
-	}
-}

package/platforms/android/java/org/nativescript/widgets/ContentLayout.java

@@ -1,85 +0,0 @@
-/**
- *
- */
-package org.nativescript.widgets;
-
-import android.content.Context;
-import android.view.View;
-import android.util.AttributeSet;
-
-/**
- * @author hhristov
- *
- */
-public class ContentLayout extends LayoutBase {
-
-	public ContentLayout(Context context) {
-		this(context, null);
-	}
-	public ContentLayout(Context context, AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
-	public ContentLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-		super(context, attrs, defStyleAttr);
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		CommonLayoutParams.adjustChildrenLayoutParams(this, widthMeasureSpec, heightMeasureSpec);
-
-		int measureWidth = 0;
-		int measureHeight = 0;
-
-		for (int i = 0, count = this.getChildCount(); i < count; i++) {
-			View child = this.getChildAt(i);
-			if (child.getVisibility() == View.GONE) {
-				continue;
-			}
-
-			CommonLayoutParams.measureChild(child, widthMeasureSpec, heightMeasureSpec);
-			final int childMeasuredWidth = CommonLayoutParams.getDesiredWidth(child);
-			final int childMeasuredHeight = CommonLayoutParams.getDesiredHeight(child);
-
-			measureWidth = Math.max(measureWidth, childMeasuredWidth);
-			measureHeight = Math.max(measureHeight, childMeasuredHeight);
-		}
-
-		// Add in our padding
-		measureWidth += this.getPaddingLeft() + this.getPaddingRight();
-		measureHeight += this.getPaddingTop() + this.getPaddingBottom();
-
-		// Check against our minimum sizes
-		measureWidth = Math.max(measureWidth, this.getSuggestedMinimumWidth());
-		measureHeight = Math.max(measureHeight, this.getSuggestedMinimumHeight());
-
-		int widthSizeAndState = resolveSizeAndState(measureWidth, widthMeasureSpec, 0);
-		int heightSizeAndState = resolveSizeAndState(measureHeight, heightMeasureSpec, 0);
-
-		this.setMeasuredDimension(widthSizeAndState, heightSizeAndState);
-	}
-
-	@Override
-	protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-		int paddingLeft = this.getPaddingLeft();
-		int paddingRight = this.getPaddingRight();
-		int paddingTop = this.getPaddingTop();
-		int paddingBottom = this.getPaddingBottom();
-
-		int childLeft = paddingLeft;
-		int childTop = paddingTop;
-
-		int childRight = right - left - (paddingLeft + paddingRight);
-		int childBottom = bottom - top - (paddingRight + paddingBottom);
-
-		for (int i = 0, count = this.getChildCount(); i < count; i++) {
-			View child = this.getChildAt(i);
-			if (child.getVisibility() == View.GONE) {
-				continue;
-			}
-
-			CommonLayoutParams.layoutChild(child, childLeft, childTop, childRight, childBottom);
-		}
-
-		CommonLayoutParams.restoreOriginalParams(this);
-	}
-}

package/platforms/android/java/org/nativescript/widgets/CustomTransition.java

@@ -1,135 +0,0 @@
-package org.nativescript.widgets;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Interpolator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
-import androidx.transition.Transition;
-import androidx.transition.TransitionListenerAdapter;
-import androidx.transition.TransitionValues;
-import androidx.transition.Visibility;
-
-import java.util.ArrayList;
-
-public class CustomTransition extends Visibility {
-	private boolean resetOnTransitionEnd;
-	private final AnimatorSet animatorSet;
-	private AnimatorSet immediateAnimatorSet;
-	private final String transitionName;
-
-	public CustomTransition(AnimatorSet animatorSet, String transitionName) {
-		this.animatorSet = animatorSet;
-		this.transitionName = transitionName;
-	}
-
-	@Nullable
-	@Override
-	public Animator onAppear(@NonNull ViewGroup sceneRoot, @NonNull final View view, @Nullable TransitionValues startValues,
-													 @Nullable TransitionValues endValues) {
-		if (endValues == null || view == null || this.animatorSet == null) {
-			return null;
-		}
-
-		return this.setAnimatorsTarget(this.animatorSet, view);
-	}
-
-	@Override
-	public Animator onDisappear(@NonNull ViewGroup sceneRoot, @NonNull final View view, @Nullable TransitionValues startValues,
-															@Nullable TransitionValues endValues) {
-		if (startValues == null || view == null || this.animatorSet == null) {
-			return null;
-		}
-
-		return this.setAnimatorsTarget(this.animatorSet, view);
-	}
-
-	public void setResetOnTransitionEnd(boolean resetOnTransitionEnd) {
-		this.resetOnTransitionEnd = resetOnTransitionEnd;
-	}
-
-	public String getTransitionName() {
-		return this.transitionName;
-	}
-
-	private Animator setAnimatorsTarget(AnimatorSet animatorSet, final View view) {
-		ArrayList<Animator> animatorsList = animatorSet.getChildAnimations();
-		boolean resetOnTransitionEnd = this.resetOnTransitionEnd;
-
-		for (int i = 0; i < animatorsList.size(); i++) {
-			animatorsList.get(i).setTarget(view);
-		}
-
-		// Reset animation to its initial state to prevent mirrorered effect
-		if (this.resetOnTransitionEnd) {
-			this.immediateAnimatorSet = this.animatorSet.clone();
-		}
-
-		// Switching to hardware layer during transition to improve animation performance
-		CustomAnimatorListener listener = new CustomAnimatorListener(view);
-		animatorSet.addListener(listener);
-		this.addListener(new CustomTransitionListenerAdapter(this));
-
-		return this.animatorSet;
-	}
-
-	private class ReverseInterpolator implements Interpolator {
-		@Override
-		public float getInterpolation(float paramFloat) {
-			return Math.abs(paramFloat - 1f);
-		}
-	}
-
-	private class CustomTransitionListenerAdapter extends TransitionListenerAdapter {
-		private CustomTransition customTransition;
-
-		CustomTransitionListenerAdapter(CustomTransition transition) {
-			this.customTransition = transition;
-		}
-
-		@Override
-		public void onTransitionEnd(@NonNull Transition transition) {
-			if (this.customTransition.resetOnTransitionEnd) {
-				this.customTransition.immediateAnimatorSet.setDuration(0);
-				this.customTransition.immediateAnimatorSet.setInterpolator(new ReverseInterpolator());
-				this.customTransition.immediateAnimatorSet.start();
-				this.customTransition.setResetOnTransitionEnd(false);
-			}
-
-			this.customTransition.immediateAnimatorSet = null;
-			this.customTransition = null;
-			transition.removeListener(this);
-		}
-	}
-
-	private static class CustomAnimatorListener extends AnimatorListenerAdapter {
-
-		private final View mView;
-		private boolean mLayerTypeChanged = false;
-
-		CustomAnimatorListener(View view) {
-			mView = view;
-		}
-
-		@Override
-		public void onAnimationStart(Animator animation) {
-			if (ViewCompat.hasOverlappingRendering(mView)
-				&& mView.getLayerType() == View.LAYER_TYPE_NONE) {
-				mLayerTypeChanged = true;
-				mView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-			}
-		}
-
-		@Override
-		public void onAnimationEnd(Animator animation) {
-			if (mLayerTypeChanged) {
-				mView.setLayerType(View.LAYER_TYPE_NONE, null);
-			}
-		}
-	}
-}