am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread

Merge commit 'e02e41f484a115b5278dcc07f2d6c90819279800' into gingerbread-plus-aosp

* commit 'e02e41f484a115b5278dcc07f2d6c90819279800':
  DO NOT MERGE: Get rid of status bar's dim during night.

1 files changed, 0 insertions, 39 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
index 1e140b94c6f4..117b126409a3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
@@ -42,10 +42,6 @@ public class StatusBarView extends FrameLayout {
     View mDate;
     FixedSizeDrawable mBackground;
     
-    boolean mNightMode = false;
-    int mStartAlpha = 0, mEndAlpha = 0;
-    long mEndTime = 0;
-
     public StatusBarView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -69,29 +65,6 @@ public class StatusBarView extends FrameLayout {
     }
     
     @Override
-    protected void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        boolean nightMode = (newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK)
-                == Configuration.UI_MODE_NIGHT_YES;
-        if (mNightMode != nightMode) {
-            mNightMode = nightMode;
-            mStartAlpha = getCurAlpha();
-            mEndAlpha = mNightMode ? 0x80 : 0x00;
-            mEndTime = SystemClock.uptimeMillis() + DIM_ANIM_TIME;
-            invalidate();
-        }
-    }
-
-    int getCurAlpha() {
-        long time = SystemClock.uptimeMillis();
-        if (time > mEndTime) {
-            return mEndAlpha;
-        }
-        return mEndAlpha
-                - (int)(((mEndAlpha-mStartAlpha) * (mEndTime-time) / DIM_ANIM_TIME));
-    }
-    
-    @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
         mService.updateExpandedViewPos(StatusBarService.EXPANDED_LEAVE_ALONE);
@@ -127,18 +100,6 @@ public class StatusBarView extends FrameLayout {
         mBackground.setFixedBounds(-mDate.getLeft(), -mDate.getTop(), (r-l), (b-t));
     }
 
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-        int alpha = getCurAlpha();
-        if (alpha != 0) {
-            canvas.drawARGB(alpha, 0, 0, 0);
-        }
-        if (alpha != mEndAlpha) {
-            invalidate();
-        }
-    }
-
     /**
      * Gets the left position of v in this view.  Throws if v is not
      * a child of this.