Statubar date fix

Change-Id: I69058d9a4965526e43d3dd367370626e500db894
thekraven · Jan 26, 2012 · 336237e · 336237e
1 parent 7479afb
commit 336237e
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
@@ -562,7 +562,7 @@ protected void addStatusBarView() {
 
         final View view = mStatusBarContainer;
 
-	int mPixelFormat = PixelFormat.RGBX_8888;
+	int mPixelFormat = PixelFormat.TRANSLUCENT;
         if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.TRANSPARENT_STATUS_BAR, 0) != 0) {
           // transparent statusbar enabled?
           mPixelFormat = PixelFormat.TRANSLUCENT;
@@ -950,9 +950,10 @@ private void makeExpandedVisible() {
         mTrackingView.setVisibility(View.VISIBLE);
         mExpandedView.setVisibility(View.VISIBLE);
 
-//        if (!mTicking) {
-//            setDateViewVisibility(true, com.android.internal.R.anim.fade_in);
-//        }
+        if (!mTicking) {
+            setDateViewVisibility(true, com.android.internal.R.anim.fade_in);
+	    setNotificationIconVisibility(false, com.android.internal.R.anim.fade_out);
+        }
     }
 
     public void animateExpand() {
@@ -1458,9 +1459,9 @@ void tickerDone() {
             mIcons.startAnimation(loadAnim(com.android.internal.R.anim.push_down_in, null));
 	    mCenterClock.startAnimation(loadAnim(com.android.internal.R.anim.push_down_in, null));
             mTickerView.startAnimation(loadAnim(com.android.internal.R.anim.push_down_out, null));
-//            if (mExpandedVisible) {
-//                setDateViewVisibility(true, com.android.internal.R.anim.push_down_in);
-//            }
+            if (mExpandedVisible) {
+                setDateViewVisibility(true, com.android.internal.R.anim.push_down_in);
+            }
         }
 
         void tickerHalting() {
@@ -1472,9 +1473,9 @@ void tickerHalting() {
             mIcons.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
 	    mCenterClock.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
             mTickerView.startAnimation(loadAnim(com.android.internal.R.anim.fade_out, null));
-//            if (mExpandedVisible) {
-//                setDateViewVisibility(true, com.android.internal.R.anim.fade_in);
-//            }
+            if (mExpandedVisible) {
+                setDateViewVisibility(true, com.android.internal.R.anim.fade_in);
+            }
         }
     }
 
@@ -1626,6 +1627,11 @@ void setDateViewVisibility(boolean visible, int anim) {
         mDateView.setUpdates(visible);
         mDateView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
         mDateView.startAnimation(loadAnim(anim, null));
+	if (visible) {
+            setNotificationIconVisibility(false, com.android.internal.R.anim.fade_out);
+        } else {
+            setNotificationIconVisibility(true, com.android.internal.R.anim.fade_in);
+        }
     }
 
     void setNotificationIconVisibility(boolean visible, int anim) {
@@ -1634,7 +1640,7 @@ void setNotificationIconVisibility(boolean visible, int anim) {
         if (old != v) {
             mNotificationIcons.setVisibility(v);
             mNotificationIcons.startAnimation(loadAnim(anim, null));
-        }
+	}    
     }
 
     void updateExpandedViewPos(int expandedPosition) {