Skip to content

Commit f7f16f7

Browse files
author
Romain Guy
committed
Tale of status bar on crespo, part 1
Bug #6541079 In which ghosts are more desirable than standing soldiers. Change-Id: I92ec33fa344938eabe5adf6644683c7ab19ba8a5
1 parent 94328c3 commit f7f16f7

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import android.util.DisplayMetrics;
4646
import android.util.Log;
4747
import android.util.Slog;
48-
import android.util.TypedValue;
4948
import android.view.Choreographer;
5049
import android.view.Display;
5150
import android.view.Gravity;
@@ -56,20 +55,16 @@
5655
import android.view.View;
5756
import android.view.ViewGroup;
5857
import android.view.ViewGroup.LayoutParams;
59-
import android.view.Window;
6058
import android.view.WindowManager;
6159
import android.view.WindowManagerImpl;
6260
import android.view.animation.AccelerateInterpolator;
6361
import android.view.animation.Animation;
6462
import android.view.animation.AnimationUtils;
65-
import android.widget.CompoundButton;
6663
import android.widget.FrameLayout;
6764
import android.widget.ImageView;
6865
import android.widget.LinearLayout;
69-
import android.widget.RemoteViews;
7066
import android.widget.ScrollView;
7167
import android.widget.TextView;
72-
7368
import com.android.internal.statusbar.StatusBarIcon;
7469
import com.android.internal.statusbar.StatusBarNotification;
7570
import com.android.systemui.R;
@@ -80,7 +75,6 @@
8075
import com.android.systemui.statusbar.RotationToggle;
8176
import com.android.systemui.statusbar.SignalClusterView;
8277
import com.android.systemui.statusbar.StatusBarIconView;
83-
import com.android.systemui.statusbar.policy.AutoRotateController;
8478
import com.android.systemui.statusbar.policy.BatteryController;
8579
import com.android.systemui.statusbar.policy.DateView;
8680
import com.android.systemui.statusbar.policy.IntruderAlertView;
@@ -224,6 +218,18 @@ public class PhoneStatusBar extends BaseStatusBar {
224218
DisplayMetrics mDisplayMetrics = new DisplayMetrics();
225219

226220
private int mNavigationIconHints = 0;
221+
private final Animator.AnimatorListener mMakeIconsInvisible = new AnimatorListenerAdapter() {
222+
@Override
223+
public void onAnimationEnd(Animator animation) {
224+
mIcons.setVisibility(View.INVISIBLE);
225+
}
226+
};
227+
private final Animator.AnimatorListener mMakeIconsVisible = new AnimatorListenerAdapter() {
228+
@Override
229+
public void onAnimationEnd(Animator animation) {
230+
mIcons.setVisibility(View.VISIBLE);
231+
}
232+
};
227233

228234
private class ExpandedDialog extends Dialog {
229235
ExpandedDialog(Context context) {
@@ -884,9 +890,11 @@ public void disable(int state) {
884890
if ((diff & StatusBarManager.DISABLE_SYSTEM_INFO) != 0) {
885891
mIcons.animate().cancel();
886892
if ((state & StatusBarManager.DISABLE_SYSTEM_INFO) != 0) {
887-
mIcons.animate().alpha(0f).setStartDelay(100).setDuration(200).start();
893+
mIcons.animate().alpha(0f).setStartDelay(100).setDuration(200).
894+
setListener(mMakeIconsInvisible).start();
888895
} else {
889-
mIcons.animate().alpha(1f).setStartDelay(0).setDuration(300).start();
896+
mIcons.animate().alpha(1f).setStartDelay(0).setDuration(300).
897+
setListener(mMakeIconsVisible).start();
890898
}
891899
}
892900

@@ -1792,7 +1800,6 @@ protected void updateExpandedViewPos(int expandedPosition) {
17921800
}
17931801

17941802
int panelh = 0;
1795-
final boolean portrait = mDisplayMetrics.heightPixels > mDisplayMetrics.widthPixels;
17961803

17971804
final int disph = getExpandedViewMaxHeight();
17981805

0 commit comments

Comments
 (0)