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

Merge "Improved the heads up logic to launch fullscreen intents less" into nyc-dev

Browse Source 
am: 8a7f35e4ef

* commit '8a7f35e4efc907cc5926a206e5418fb6e010ae6e':
  Improved the heads up logic to launch fullscreen intents less
This commit is contained in:
Selim Cinek
2016-02-11 03:43:57 +00:00
committed by android-build-merger
parent d3dc95434d 8a7f35e4ef
commit 7e4b1de4a0
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -2080,8 +2080,25 @@ public abstract class BaseStatusBar extends SystemUI implements
return false;
}
if (isSnoozedPackage(sbn)) {
if (DEBUG) Log.d(TAG, "No peeking: snoozed package: " + sbn.getKey());
boolean inUse = mPowerManager.isScreenOn()
&& (!mStatusBarKeyguardViewManager.isShowing()
|| mStatusBarKeyguardViewManager.isOccluded())
&& !mStatusBarKeyguardViewManager.isInputRestricted();
try {
inUse = inUse && !mDreamManager.isDreaming();
} catch (RemoteException e) {
Log.d(TAG, "failed to query dream manager", e);
}
if (!inUse) {
if (DEBUG) {
Log.d(TAG, "No peeking: not in use: " + sbn.getKey());
}
return false;
}
if (mNotificationData.shouldSuppressScreenOn(sbn.getKey())) {
if (DEBUG) Log.d(TAG, "No peeking: suppressed by DND: " + sbn.getKey());
return false;
}
@@ -2090,15 +2107,17 @@ public abstract class BaseStatusBar extends SystemUI implements
return false;
}
if (sbn.getNotification().fullScreenIntent != null
&& mAccessibilityManager.isTouchExplorationEnabled()) {
if (DEBUG) Log.d(TAG, "No peeking: accessible fullscreen: " + sbn.getKey());
return false;
if (sbn.getNotification().fullScreenIntent != null) {
if (mAccessibilityManager.isTouchExplorationEnabled()) {
if (DEBUG) Log.d(TAG, "No peeking: accessible fullscreen: " + sbn.getKey());
return false;
} else {
return true;
}
}
if (mNotificationData.shouldSuppressScreenOn(sbn.getKey())) {
if (DEBUG) Log.d(TAG, "No peeking: suppressed by DND: " + sbn.getKey());
if (isSnoozedPackage(sbn)) {
if (DEBUG) Log.d(TAG, "No peeking: snoozed package: " + sbn.getKey());
return false;
}
@@ -2107,17 +2126,7 @@ public abstract class BaseStatusBar extends SystemUI implements
return false;
}
boolean inUse = mPowerManager.isScreenOn()
&& (!mStatusBarKeyguardViewManager.isShowing()
|| mStatusBarKeyguardViewManager.isOccluded())
&& !mStatusBarKeyguardViewManager.isInputRestricted();
try {
inUse = inUse && !mDreamManager.isDreaming();
} catch (RemoteException e) {
Log.d(TAG, "failed to query dream manager", e);
}
if (DEBUG) Log.d(TAG, "peek if device in use: " + inUse);
return inUse;
return true;
}
protected abstract boolean isSnoozedPackage(StatusBarNotification sbn);