Skip to content

Active display: turn off display if device gets pocketed again #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Der-Schubi wants to merge 2 commits into
base: jellybean-mr2.1
Choose a base branch
from
Open

Active display: turn off display if device gets pocketed again #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad349cc
Active display: turn off display if device gets pocketed again
Der-Schubi Sep 22, 2013
537d050
Active display: Catch Resource.NotFoundException
Der-Schubi Sep 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ...s/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public class ActiveDisplayView extends FrameLayout {
private Sensor mProximitySensor;
private boolean mProximityIsFar = true;
private boolean mIsInBrightLight = false;
private boolean mWakedByPocketMode = false;
private LinearLayout mOverflowNotifications;
private LayoutParams mRemoteViewLayoutParams;
private int mIconSize;
Expand Down Expand Up @@ -186,6 +187,7 @@ public void onNotificationRemoved(final StatusBarNotification sbn) {

public void onTrigger(final View v, final int target) {
if (target == UNLOCK_TARGET) {
mWakedByPocketMode = false;
mNotification = null;
hideNotificationView();
if (!mKeyguardManager.isKeyguardSecure()) {
Expand All @@ -200,6 +202,7 @@ public void onTrigger(final View v, final int target) {
}
}
} else if (target == OPEN_APP_TARGET) {
mWakedByPocketMode = false;
hideNotificationView();
if (!mKeyguardManager.isKeyguardSecure()) {
try {
Expand Down Expand Up @@ -668,6 +671,7 @@ private void onScreenTurnedOff() {
}

private void turnScreenOff() {
mWakedByPocketMode = false;
try {
mPM.goToSleep(SystemClock.uptimeMillis(), 0);
} catch (RemoteException e) {
Expand Down Expand Up @@ -820,6 +824,7 @@ public void run() {
}
} catch (RemoteException re) {
} catch (NameNotFoundException nnfe) {
} catch (Resources.NotFoundException e) {
}
}
});
Expand Down Expand Up @@ -933,6 +938,7 @@ public void run() {
}
});
} catch (NameNotFoundException e) {
} catch (Resources.NotFoundException e) {
}
}

Expand Down Expand Up @@ -997,11 +1003,20 @@ public void onSensorChanged(SensorEvent event) {
if (value >= mProximitySensor.getMaximumRange()) {
mProximityIsFar = true;
if (!isScreenOn() && mPocketModeEnabled && !isOnCall()) {
mWakedByPocketMode = true;

mNotification = getNextAvailableNotification();
if (mNotification != null) showNotification(mNotification, true);
}
} else {
mProximityIsFar = false;
if (isScreenOn() && mPocketModeEnabled && !isOnCall() && mWakedByPocketMode) {
mWakedByPocketMode = false;

restoreBrightness();
cancelTimeoutTimer();
turnScreenOff();
}
}
} else if (event.sensor.equals(mLightSensor)) {
boolean isBright = mIsInBrightLight;
Expand Down Expand Up @@ -1108,4 +1123,4 @@ private void cancelTimeoutTimer() {
} catch (Exception e) {
}
}
}
}