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

Merge "Revert "Fade in quick settings when shade opens""

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-19 21:18:48 +00:00
committed by Android (Google) Code Review
parent 4fb7f9e542 f27b9501fc
commit eef471859b
3 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
View File

@@ -29,7 +29,6 @@ import com.android.systemui.qs.QSPanel.QSTileLayout;
import com.android.systemui.qs.TouchAnimator.Builder;
import com.android.systemui.qs.TouchAnimator.Listener;
import com.android.systemui.qs.dagger.QSScope;
import com.android.systemui.statusbar.CrossFadeHelper;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.tuner.TunerService.Tunable;
@@ -50,9 +49,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
private static final String MOVE_FULL_ROWS = "sysui_qs_move_whole_rows";
public static final float EXPANDED_TILE_DELAY = .86f;
private static final long QQS_FADE_IN_DURATION = 200L;
// Fade out faster than fade in to finish before QQS hides.
private static final long QQS_FADE_OUT_DURATION = 50L;
private final ArrayList<View> mAllViews = new ArrayList<>();
/**
@@ -80,7 +77,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
private TouchAnimator mBrightnessAnimator;
private boolean mNeedsAnimatorUpdate = false;
private boolean mToShowing;
private boolean mOnKeyguard;
private boolean mAllowFancy;
@@ -137,18 +133,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
}
}
void startAlphaAnimation(boolean show) {
if (show == mToShowing) {
return;
}
mToShowing = show;
if (show) {
CrossFadeHelper.fadeIn(mQs.getView(), QQS_FADE_IN_DURATION, 0 /* delay */);
} else {
CrossFadeHelper.fadeOut(mQs.getView(), QQS_FADE_OUT_DURATION, 0 /* delay */,
null /* endRunnable */);
}
}
/**
* Sets whether or not the keyguard is currently being shown with a collapsed header.

5
packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
View File

@@ -91,11 +91,6 @@ public class QSContainerImpl extends FrameLayout {
setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
}
@Override
public boolean hasOverlappingRendering() {
return false;
}
void onMediaVisibilityChanged(boolean qsVisible) {
mAnimateBottomOnNextLayout = qsVisible;
}

5
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -186,7 +186,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
(v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
boolean sizeChanged = (oldTop - oldBottom) != (top - bottom);
if (sizeChanged) {
setQsExpansion(mLastQSExpansion, mLastHeaderTranslation);
setQsExpansion(mLastQSExpansion, mLastQSExpansion);
}
});
}
@@ -391,9 +391,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
@Override
public void setQsExpansion(float expansion, float headerTranslation) {
if (DEBUG) Log.d(TAG, "setQSExpansion " + expansion + " " + headerTranslation);
if (mQSAnimator != null) {
mQSAnimator.startAlphaAnimation(headerTranslation == 0 /* show */);
}
mContainer.setExpansion(expansion);
final float translationScaleY = expansion - 1;
boolean onKeyguardAndExpanded = isKeyguardShowing() && !mShowCollapsedOnKeyguard;