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

Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev

Browse Source
This commit is contained in:
Selim Cinek
2014-12-11 14:08:08 +00:00
committed by Android (Google) Code Review
parent 15cd63027b c430a5b2e4
commit 8f51c4c5e5
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
View File

@@ -25,8 +25,6 @@ import android.graphics.Bitmap;
import android.graphics.BitmapShader; import android.graphics.BitmapShader;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter; import android.graphics.PorterDuffColorFilter;
@@ -43,7 +41,6 @@ import android.view.animation.LinearInterpolator;
import android.view.animation.PathInterpolator; import android.view.animation.PathInterpolator;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.statusbar.phone.NotificationPanelView;
/** /**
* Base class for both {@link ExpandableNotificationRow} and {@link NotificationOverflowContainer} * Base class for both {@link ExpandableNotificationRow} and {@link NotificationOverflowContainer}
@@ -355,11 +352,14 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
if (mActivated) { if (mActivated) {
mBackgroundDimmed.setVisibility(View.VISIBLE); mBackgroundDimmed.setVisibility(View.VISIBLE);
mBackgroundNormal.setVisibility(View.VISIBLE); mBackgroundNormal.setVisibility(View.VISIBLE);
} else { } else if (mDimmed) {
mBackgroundDimmed.setVisibility(View.VISIBLE); mBackgroundDimmed.setVisibility(View.VISIBLE);
mBackgroundNormal.setVisibility(View.INVISIBLE); mBackgroundNormal.setVisibility(View.INVISIBLE);
} else {
mBackgroundDimmed.setVisibility(View.INVISIBLE);
mBackgroundNormal.setVisibility(View.VISIBLE);
} }
fadeDarkToDimmed(delay); fadeInFromDark(delay);
} else { } else {
updateBackground(); updateBackground();
} }
@@ -401,15 +401,16 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
} }
/** /**
* Fades the dimmed background when exiting dark mode. * Fades in the background when exiting dark mode.
*/ */
private void fadeDarkToDimmed(long delay) { private void fadeInFromDark(long delay) {
mBackgroundDimmed.setAlpha(0f); final View background = mDimmed ? mBackgroundDimmed : mBackgroundNormal;
mBackgroundDimmed.setPivotX(mBackgroundDimmed.getWidth() / 2f); background.setAlpha(0f);
mBackgroundDimmed.setPivotY(getActualHeight() / 2f); background.setPivotX(mBackgroundDimmed.getWidth() / 2f);
mBackgroundDimmed.setScaleX(DARK_EXIT_SCALE_START); background.setPivotY(getActualHeight() / 2f);
mBackgroundDimmed.setScaleY(DARK_EXIT_SCALE_START); background.setScaleX(DARK_EXIT_SCALE_START);
mBackgroundDimmed.animate() background.setScaleY(DARK_EXIT_SCALE_START);
background.animate()
.alpha(1f) .alpha(1f)
.scaleX(1f) .scaleX(1f)
.scaleY(1f) .scaleY(1f)
@@ -420,9 +421,9 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
@Override @Override
public void onAnimationCancel(Animator animation) { public void onAnimationCancel(Animator animation) {
// Jump state if we are cancelled // Jump state if we are cancelled
mBackgroundDimmed.setScaleX(1f); background.setScaleX(1f);
mBackgroundDimmed.setScaleY(1f); background.setScaleY(1f);
mBackgroundDimmed.setAlpha(1f); background.setAlpha(1f);
} }
}) })
.start(); .start();