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

Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-07 23:40:32 +00:00
committed by Android (Google) Code Review
parent 50caf4af60 c18a13d97f
commit 4317e457ba
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -4651,6 +4651,11 @@ public class StatusBar extends SystemUI implements DemoMode,
@Override @Override
public void onActivated(ActivatableNotificationView view) { public void onActivated(ActivatableNotificationView view) {
onActivated((View)view);
mStackScroller.setActivatedChild(view);
}
public void onActivated(View view) {
mLockscreenGestureLogger.write( mLockscreenGestureLogger.write(
MetricsEvent.ACTION_LS_NOTE, MetricsEvent.ACTION_LS_NOTE,
0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */); 0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */);
@@ -4659,7 +4664,6 @@ public class StatusBar extends SystemUI implements DemoMode,
if (previousView != null) { if (previousView != null) {
previousView.makeInactive(true /* animate */); previousView.makeInactive(true /* animate */);
} }
mStackScroller.setActivatedChild(view);
} }
/** /**
@@ -4693,11 +4697,15 @@ public class StatusBar extends SystemUI implements DemoMode,
@Override @Override
public void onActivationReset(ActivatableNotificationView view) { public void onActivationReset(ActivatableNotificationView view) {
if (view == mStackScroller.getActivatedChild()) { if (view == mStackScroller.getActivatedChild()) {
mKeyguardIndicationController.hideTransientIndication();
mStackScroller.setActivatedChild(null); mStackScroller.setActivatedChild(null);
onActivationReset((View)view);
} }
} }
public void onActivationReset(View view) {
mKeyguardIndicationController.hideTransientIndication();
}
public void onTrackingStarted() { public void onTrackingStarted() {
runPostCollapseRunnables(); runPostCollapseRunnables();
} }