summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/res/layout/super_status_bar.xml6
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java17
2 files changed, 9 insertions, 14 deletions
diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml
index 029d16e999cc..ef442e539c0c 100644
--- a/packages/SystemUI/res/layout/super_status_bar.xml
+++ b/packages/SystemUI/res/layout/super_status_bar.xml
@@ -43,7 +43,8 @@
android:visibility="invisible" />
</com.android.systemui.statusbar.BackDropView>
- <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_behind"
+ <com.android.systemui.statusbar.ScrimView
+ android:id="@+id/scrim_behind"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:importantForAccessibility="no"
@@ -75,7 +76,8 @@
android:layout_height="match_parent"
android:visibility="invisible" />
- <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_in_front"
+ <com.android.systemui.statusbar.ScrimView
+ android:id="@+id/scrim_in_front"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:importantForAccessibility="no"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java
index 8830352296dd..475a6091323e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java
@@ -107,6 +107,11 @@ public class ScrimView extends View implements ConfigurationController.Configura
}
@Override
+ public void setBackground(Drawable background) {
+ Log.wtfStack(TAG, "ScrimView should never have a background.");
+ }
+
+ @Override
protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
int densityDpi = newConfig.densityDpi;
@@ -321,18 +326,6 @@ public class ScrimView extends View implements ConfigurationController.Configura
return mViewAlpha;
}
- public void animateViewAlpha(float alpha, long durationOut, Interpolator interpolator) {
- if (mAlphaAnimator != null) {
- mAlphaAnimator.cancel();
- }
- mAlphaAnimator = ValueAnimator.ofFloat(getViewAlpha(), alpha);
- mAlphaAnimator.addUpdateListener(mAlphaUpdateListener);
- mAlphaAnimator.addListener(mClearAnimatorListener);
- mAlphaAnimator.setInterpolator(interpolator);
- mAlphaAnimator.setDuration(durationOut);
- mAlphaAnimator.start();
- }
-
public void setExcludedArea(Rect area) {
if (area == null) {
mHasExcludedArea = false;