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

Merge "[automerger skipped] Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: aaec0d4ac3 am: dd3baf3304 am: 58d7dae053 am: 81dfe2bfec -s ours"

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-05-28 19:28:30 +00:00
committed by Android (Google) Code Review
parent 5599d0f262 917428a9e4
commit c22be8e2d2
7 changed files with 16 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/AppOpsInfo.java
View File

@@ -188,11 +188,6 @@ public class AppOpsInfo extends LinearLayout implements NotificationGuts.GutsCon
return false;
}
@Override
public boolean needsFalsingProtection() {
return false;
}
@Override
public View getContentView() {
return this;

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
View File

@@ -403,11 +403,6 @@ public class NotificationConversationInfo extends LinearLayout implements
// TODO: do we need to do anything here?
}
@Override
public boolean needsFalsingProtection() {
return true;
}
@Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(event);

6
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGuts.java
View File

@@ -104,12 +104,6 @@ public class NotificationGuts extends FrameLayout {
* Called when the guts view has finished its close animation.
*/
default void onFinishedClosing() {}
/**
* Returns whether falsing protection is needed before showing the contents of this
* view on the lockscreen
*/
boolean needsFalsingProtection();
}
public interface OnGutsClosedListener {

36
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
View File

@@ -523,27 +523,23 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
int x,
int y,
NotificationMenuRowPlugin.MenuItem menuItem) {
if (menuItem.getGutsView() instanceof NotificationGuts.GutsContent) {
NotificationGuts.GutsContent gutsView =
(NotificationGuts.GutsContent) menuItem.getGutsView();
if (gutsView.needsFalsingProtection()) {
if (mStatusBarStateController instanceof StatusBarStateControllerImpl) {
((StatusBarStateControllerImpl) mStatusBarStateController)
.setLeaveOpenOnKeyguardHide(true);
}
Runnable r = () -> mMainHandler.post(
() -> openGutsInternal(view, x, y, menuItem));
mStatusBarLazy.get().executeRunnableDismissingKeyguard(
r,
null /* cancelAction */,
false /* dismissShade */,
true /* afterKeyguardGone */,
true /* deferred */);
return true;
if (menuItem.getGutsView() instanceof NotificationInfo) {
if (mStatusBarStateController instanceof StatusBarStateControllerImpl) {
((StatusBarStateControllerImpl) mStatusBarStateController)
.setLeaveOpenOnKeyguardHide(true);
}
Runnable r = () -> mMainHandler.post(
() -> openGutsInternal(view, x, y, menuItem));
mStatusBarLazy.get().executeRunnableDismissingKeyguard(
r,
null /* cancelAction */,
false /* dismissShade */,
true /* afterKeyguardGone */,
true /* deferred */);
return true;
}
return openGutsInternal(view, x, y, menuItem);
}

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
View File

@@ -489,11 +489,6 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
mMetricsLogger.write(notificationControlsLogMaker().setType(MetricsEvent.TYPE_CLOSE));
}
@Override
public boolean needsFalsingProtection() {
return true;
}
@Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(event);

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java
View File

@@ -442,11 +442,6 @@ public class NotificationSnooze extends LinearLayout
return true;
}
@Override
public boolean needsFalsingProtection() {
return false;
}
public class NotificationSnoozeOption implements SnoozeOption {
private SnoozeCriterion mCriterion;
private int mMinutesToSnoozeFor;

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PartialConversationInfo.java
View File

@@ -300,11 +300,6 @@ public class PartialConversationInfo extends LinearLayout implements
// TODO: do we need to do anything here?
}
@Override
public boolean needsFalsingProtection() {
return true;
}
@Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(event);