|
45 | 45 | import android.util.DisplayMetrics; |
46 | 46 | import android.util.Log; |
47 | 47 | import android.util.Slog; |
48 | | -import android.util.TypedValue; |
49 | 48 | import android.view.Choreographer; |
50 | 49 | import android.view.Display; |
51 | 50 | import android.view.Gravity; |
|
56 | 55 | import android.view.View; |
57 | 56 | import android.view.ViewGroup; |
58 | 57 | import android.view.ViewGroup.LayoutParams; |
59 | | -import android.view.Window; |
60 | 58 | import android.view.WindowManager; |
61 | 59 | import android.view.WindowManagerImpl; |
62 | 60 | import android.view.animation.AccelerateInterpolator; |
63 | 61 | import android.view.animation.Animation; |
64 | 62 | import android.view.animation.AnimationUtils; |
65 | | -import android.widget.CompoundButton; |
66 | 63 | import android.widget.FrameLayout; |
67 | 64 | import android.widget.ImageView; |
68 | 65 | import android.widget.LinearLayout; |
69 | | -import android.widget.RemoteViews; |
70 | 66 | import android.widget.ScrollView; |
71 | 67 | import android.widget.TextView; |
72 | | - |
73 | 68 | import com.android.internal.statusbar.StatusBarIcon; |
74 | 69 | import com.android.internal.statusbar.StatusBarNotification; |
75 | 70 | import com.android.systemui.R; |
|
80 | 75 | import com.android.systemui.statusbar.RotationToggle; |
81 | 76 | import com.android.systemui.statusbar.SignalClusterView; |
82 | 77 | import com.android.systemui.statusbar.StatusBarIconView; |
83 | | -import com.android.systemui.statusbar.policy.AutoRotateController; |
84 | 78 | import com.android.systemui.statusbar.policy.BatteryController; |
85 | 79 | import com.android.systemui.statusbar.policy.DateView; |
86 | 80 | import com.android.systemui.statusbar.policy.IntruderAlertView; |
@@ -224,6 +218,18 @@ public class PhoneStatusBar extends BaseStatusBar { |
224 | 218 | DisplayMetrics mDisplayMetrics = new DisplayMetrics(); |
225 | 219 |
|
226 | 220 | 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 | + }; |
227 | 233 |
|
228 | 234 | private class ExpandedDialog extends Dialog { |
229 | 235 | ExpandedDialog(Context context) { |
@@ -884,9 +890,11 @@ public void disable(int state) { |
884 | 890 | if ((diff & StatusBarManager.DISABLE_SYSTEM_INFO) != 0) { |
885 | 891 | mIcons.animate().cancel(); |
886 | 892 | 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(); |
888 | 895 | } else { |
889 | | - mIcons.animate().alpha(1f).setStartDelay(0).setDuration(300).start(); |
| 896 | + mIcons.animate().alpha(1f).setStartDelay(0).setDuration(300). |
| 897 | + setListener(mMakeIconsVisible).start(); |
890 | 898 | } |
891 | 899 | } |
892 | 900 |
|
@@ -1792,7 +1800,6 @@ protected void updateExpandedViewPos(int expandedPosition) { |
1792 | 1800 | } |
1793 | 1801 |
|
1794 | 1802 | int panelh = 0; |
1795 | | - final boolean portrait = mDisplayMetrics.heightPixels > mDisplayMetrics.widthPixels; |
1796 | 1803 |
|
1797 | 1804 | final int disph = getExpandedViewMaxHeight(); |
1798 | 1805 |
|
|
0 commit comments