am 288180c2: Merge "Avoid accidentally using software layers" into klp-dev (6fe99af1) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/KeyguardWidgetFrame.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ public class KeyguardWidgetFrame extends FrameLayout {
		*/
		public void enableHardwareLayersForContent() {
		View widget = getContent();
		if (widget != null) {
		if (widget != null && widget.isHardwareAccelerated()) {
		widget.setLayerType(LAYER_TYPE_HARDWARE, null);
		}
		}
		@@ -271,14 +271,6 @@ public class KeyguardWidgetFrame extends FrameLayout {
		}
		}

		public void enableHardwareLayers() {
		setLayerType(LAYER_TYPE_HARDWARE, null);
		}

		public void disableHardwareLayers() {
		setLayerType(LAYER_TYPE_NONE, null);
		}

		public View getContent() {
		return getChildAt(0);
		}

packages/Keyguard/src/com/android/keyguard/SlidingChallengeLayout.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -395,7 +395,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout
		cancelTransitionsInProgress();

		mChallengeInteractiveInternal = false;
		mChallengeView.setLayerType(LAYER_TYPE_HARDWARE, null);
		enableHardwareLayerForChallengeView();
		final int sy = mChallengeView.getBottom();
		final int dy = y - sy;
		if (dy == 0) {
		@@ -580,7 +580,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout
		mGestureStartY = y;
		mGestureStartChallengeBottom = getChallengeBottom();
		mDragging = true;
		mChallengeView.setLayerType(LAYER_TYPE_HARDWARE, null);
		enableHardwareLayerForChallengeView();
		} else if (mChallengeShowing && isInChallengeView(x, y)) {
		mBlockDrag = true;
		}
		@@ -657,7 +657,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout
		mActivePointerId = ev.getPointerId(i);
		mGestureStartChallengeBottom = getChallengeBottom();
		mDragging = true;
		mChallengeView.setLayerType(LAYER_TYPE_HARDWARE, null);
		enableHardwareLayerForChallengeView();
		break;
		}
		}
		@@ -1065,7 +1065,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout

		private void onFadeStart(boolean show) {
		mChallengeInteractiveInternal = false;
		mChallengeView.setLayerType(LAYER_TYPE_HARDWARE, null);
		enableHardwareLayerForChallengeView();

		if (show) {
		moveChallengeTo(getMinChallengeBottom());
		@@ -1074,6 +1074,12 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout
		setScrollState(SCROLL_STATE_FADING);
		}

		private void enableHardwareLayerForChallengeView() {
		if (mChallengeView.isHardwareAccelerated()) {
		mChallengeView.setLayerType(LAYER_TYPE_HARDWARE, null);
		}
		}

		private void onFadeEnd(boolean show) {
		mChallengeInteractiveInternal = true;
		setChallengeShowing(show);