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

Merge "The transformhelper now also transforms gone views"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-14 21:19:19 +00:00
committed by Android (Google) Code Review
parent 8b39573f15 00708abfe6
commit ffc9c74013
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/ViewTransformationHelper.java
View File

@@ -224,9 +224,6 @@ public class ViewTransformationHelper implements TransformableView {
stack.push(viewRoot);
while (!stack.isEmpty()) {
View child = stack.pop();
if (child.getVisibility() == View.GONE) {
continue;
}
Boolean containsView = (Boolean) child.getTag(TAG_CONTAINS_TRANSFORMED_VIEW);
if (containsView == null) {
// This one is unhandled, let's add it to our list.

3
packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java
View File

@@ -69,7 +69,8 @@ public class TransformState {
public void transformViewFrom(TransformState otherState, float transformationAmount) {
mTransformedView.animate().cancel();
if (sameAs(otherState)) {
if (mTransformedView.getVisibility() == View.INVISIBLE) {
if (mTransformedView.getVisibility() == View.INVISIBLE
|| mTransformedView.getAlpha() != 1.0f) {
// We have the same content, lets show ourselves
mTransformedView.setAlpha(1.0f);
mTransformedView.setVisibility(View.VISIBLE);