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

Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am: 7b04275a68

Browse Source 
am: f53ce454f4

Change-Id: I763d062729a083c29f53bd2c5065fd07762f0bf3
This commit is contained in:
Selim Cinek
2017-07-06 16:38:59 +00:00
committed by android-build-merger
parent d9e57599d1 f53ce454f4
commit ea2d5a2b43
2 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SystemUI/src/com/android/systemui/ExpandHelper.java
View File

@@ -545,6 +545,16 @@ public class ExpandHelper implements Gefingerpoken {
*/
@VisibleForTesting
void finishExpanding(boolean forceAbort, float velocity) {
finishExpanding(forceAbort, velocity, true /* allowAnimation */);
}
/**
* Finish the current expand motion
* @param forceAbort whether the expansion should be forcefully aborted and returned to the old
* state
* @param velocity the velocity this was expanded/ collapsed with
*/
private void finishExpanding(boolean forceAbort, float velocity, boolean allowAnimation) {
if (!mExpanding) return;
if (DEBUG) Log.d(TAG, "scale in finishing on view: " + mResizedView);
@@ -568,7 +578,7 @@ public class ExpandHelper implements Gefingerpoken {
mCallback.expansionStateChanged(false);
int naturalHeight = mScaler.getNaturalHeight();
float targetHeight = nowExpanded ? naturalHeight : mSmallSize;
if (targetHeight != currentHeight && mEnabled) {
if (targetHeight != currentHeight && mEnabled && allowAnimation) {
mScaleAnimation.setFloatValues(targetHeight);
mScaleAnimation.setupStartValues();
final View scaledView = mResizedView;
@@ -621,11 +631,23 @@ public class ExpandHelper implements Gefingerpoken {
mResizedView = null;
}
/**
* Use this to abort any pending expansions in progress and force that there will be no
* animations.
*/
public void cancelImmediately() {
cancel(false /* allowAnimation */);
}
/**
* Use this to abort any pending expansions in progress.
*/
public void cancel() {
finishExpanding(true /* forceAbort */, 0f /* velocity */);
cancel(true /* allowAnimation */);
}
private void cancel(boolean allowAnimation) {
finishExpanding(true /* forceAbort */, 0f /* velocity */, allowAnimation);
clearView();
// reset the gesture detector

31
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -3362,15 +3362,29 @@ public class NotificationStackScrollLayout extends ViewGroup
if (!mIsExpanded) {
setOwnScrollY(0);
mStatusBar.resetUserExpandedStates();
clearTemporaryViews();
clearUserLockedViews();
}
}
// lets make sure nothing is in the overlay / transient anymore
clearTemporaryViews(this);
for (int i = 0; i < getChildCount(); i++) {
ExpandableView child = (ExpandableView) getChildAt(i);
if (child instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
clearTemporaryViews(row.getChildrenContainer());
}
private void clearUserLockedViews() {
for (int i = 0; i < getChildCount(); i++) {
ExpandableView child = (ExpandableView) getChildAt(i);
if (child instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
row.setUserLocked(false);
}
}
}
private void clearTemporaryViews() {
// lets make sure nothing is in the overlay / transient anymore
clearTemporaryViews(this);
for (int i = 0; i < getChildCount(); i++) {
ExpandableView child = (ExpandableView) getChildAt(i);
if (child instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
clearTemporaryViews(row.getChildrenContainer());
}
}
}
@@ -3405,6 +3419,7 @@ public class NotificationStackScrollLayout extends ViewGroup
if (changed) {
if (!mIsExpanded) {
mGroupManager.collapseAllGroups();
mExpandHelper.cancelImmediately();
}
updateNotificationAnimationStates();
updateChronometers();