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

am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev

Browse Source 
* commit 'eac9f30c94fbfd0ca2db51c1e8f73c3605153062':
  Doze: Route volume keys to music only while pulsing.
This commit is contained in:
John Spurlock
2014-10-01 22:23:24 +00:00
committed by Android Git Automerger
parent 983917288d eac9f30c94
commit a0aa089bcf
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2135,6 +2135,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
return onKeyguard && (isMethodInsecure || mDozing || mScreenOnComingFromTouch); return onKeyguard && (isMethodInsecure || mDozing || mScreenOnComingFromTouch);
} }
public boolean isDozing() {
return mDozing;
}
@Override // NotificationData.Environment @Override // NotificationData.Environment
public String getCurrentMediaNotificationKey() { public String getCurrentMediaNotificationKey() {
return mMediaNotificationKey; return mMediaNotificationKey;

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
View File

@@ -23,6 +23,7 @@ import android.graphics.Paint;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode; import android.graphics.PorterDuffXfermode;
import android.graphics.Rect; import android.graphics.Rect;
import android.media.session.MediaSessionLegacyHelper;
import android.os.IBinder; import android.os.IBinder;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.KeyEvent; import android.view.KeyEvent;
@@ -133,11 +134,14 @@ public class StatusBarWindowView extends FrameLayout {
if (!down) { if (!down) {
return mService.onSpacePressed(); return mService.onSpacePressed();
} }
break;
case KeyEvent.KEYCODE_VOLUME_DOWN: case KeyEvent.KEYCODE_VOLUME_DOWN:
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
if (down) { if (mService.isDozing()) {
mService.wakeUpIfDozing(event.getEventTime(), false); MediaSessionLegacyHelper.getHelper(mContext).sendVolumeKeyEvent(event, true);
return true;
} }
break;
} }
if (mService.interceptMediaKey(event)) { if (mService.interceptMediaKey(event)) {
return true; return true;