Merge "Fix for using HARDWARE layers on unaccelerated views." (63e2c088) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -8876,6 +8876,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility

	// Destroy any previous software drawing cache if needed		// Destroy any previous software drawing cache if needed
	switch (mLayerType) {		switch (mLayerType) {
			case LAYER_TYPE_HARDWARE:
			if (mHardwareLayer != null) {
			mHardwareLayer.destroy();
			mHardwareLayer = null;
			}
			// fall through - unaccelerated views may use software layer mechanism instead
	case LAYER_TYPE_SOFTWARE:		case LAYER_TYPE_SOFTWARE:
	if (mDrawingCache != null) {		if (mDrawingCache != null) {
	mDrawingCache.recycle();		mDrawingCache.recycle();
	@@ -8887,12 +8893,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
	mUnscaledDrawingCache = null;		mUnscaledDrawingCache = null;
	}		}
	break;		break;
	case LAYER_TYPE_HARDWARE:
	if (mHardwareLayer != null) {
	mHardwareLayer.destroy();
	mHardwareLayer = null;
	}
	break;
	default:		default:
	break;		break;
	}		}