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 
am: 4317e457ba

Change-Id: Ieef81f7433083085e8c4ad9e503ba2d333c90cd1
This commit is contained in:
Adrian Roos
2017-06-07 23:48:03 +00:00
committed by android-build-merger
parent 983a3c4f5b 4317e457ba
commit 813d6177bc
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
public void onActivated(ActivatableNotificationView view) {
onActivated((View)view);
mStackScroller.setActivatedChild(view);
}
public void onActivated(View view) {
mLockscreenGestureLogger.write(
MetricsEvent.ACTION_LS_NOTE,
0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */);
@@ -4659,7 +4664,6 @@ public class StatusBar extends SystemUI implements DemoMode,
if (previousView != null) {
previousView.makeInactive(true /* animate */);
}
mStackScroller.setActivatedChild(view);
}
/**
@@ -4693,11 +4697,15 @@ public class StatusBar extends SystemUI implements DemoMode,
@Override
public void onActivationReset(ActivatableNotificationView view) {
if (view == mStackScroller.getActivatedChild()) {
mKeyguardIndicationController.hideTransientIndication();
mStackScroller.setActivatedChild(null);
onActivationReset((View)view);
}
}
public void onActivationReset(View view) {
mKeyguardIndicationController.hideTransientIndication();
}
public void onTrackingStarted() {
runPostCollapseRunnables();
}