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

Merge "Fix 3061025: Extend wave lockscreen timeout while grabbed."

Browse Source
This commit is contained in:
Jim Miller
2010-10-08 12:52:24 -07:00
committed by Android (Google) Code Review
parent fe0ed4575e 4139b5505c
commit 1657f43095
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
policy/src/com/android/internal/policy/impl/LockScreen.java
View File

@@ -214,6 +214,9 @@ class LockScreen extends LinearLayout implements KeyguardScreen,
}
class WaveViewMethods implements WaveView.OnTriggerListener {
private static final int WAIT_FOR_ANIMATION_TIMEOUT = 500;
private static final int STAY_ON_WHILE_GRABBED_TIMEOUT = 30000;
/** {@inheritDoc} */
public void onTrigger(View v, int whichHandle) {
if (whichHandle == WaveView.OnTriggerListener.CENTER_HANDLE) {
@@ -222,13 +225,17 @@ class LockScreen extends LinearLayout implements KeyguardScreen,
public void run() {
mCallback.goToUnlockScreen();
}
}, 500);
}, WAIT_FOR_ANIMATION_TIMEOUT);
}
}
/** {@inheritDoc} */
public void onGrabbedStateChange(View v, int grabbedState) {
mCallback.pokeWakelock();
if (grabbedState == WaveView.OnTriggerListener.CENTER_HANDLE) {
mCallback.pokeWakelock(STAY_ON_WHILE_GRABBED_TIMEOUT);
} else {
mCallback.pokeWakelock();
}
}
}