Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid accidentally using software layers" into klp-dev

Browse Source
This commit is contained in:
John Reck
2013-09-30 23:10:49 +00:00
committed by Android (Google) Code Review
parent 508a57f58f 0a4079ec0c
commit 288180c244
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Keyguard/src/com/android/keyguard/KeyguardWidgetFrame.java
View File

@@ -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);
}

14
packages/Keyguard/src/com/android/keyguard/SlidingChallengeLayout.java
View File

@@ -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);