diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_normal.png deleted file mode 100644 index 54dde8216825c..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png deleted file mode 100644 index 3c0dc4e00b5b0..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_normal.png deleted file mode 100644 index c526433fd2f4b..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_normal.png deleted file mode 100644 index d13bc69c4baa5..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_normal.png deleted file mode 100644 index a137a80e866a5..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_clear_normal.png deleted file mode 100644 index 8da79450caec6..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_normal.png deleted file mode 100644 index 7cb52e3fc8670..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png deleted file mode 100644 index 8010ce7e2e590..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_normal.png deleted file mode 100644 index b9afa444b9027..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png deleted file mode 100644 index 6d46fddcc1952..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_clear_normal.png deleted file mode 100644 index afdee8fbd2a29..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_clear_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_open_normal.png deleted file mode 100644 index 774220779087d..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_open_normal.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable/ic_notifications.xml b/packages/SystemUI/res/drawable/ic_notifications.xml deleted file mode 100644 index 97a7623cf3439..0000000000000 --- a/packages/SystemUI/res/drawable/ic_notifications.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_notify_clear.xml b/packages/SystemUI/res/drawable/ic_notify_clear.xml deleted file mode 100644 index 21631985821e5..0000000000000 --- a/packages/SystemUI/res/drawable/ic_notify_clear.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 18b52932e1988..adfa1e4eaf720 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -78,22 +78,4 @@ android:padding="2dp" /> - - - - - - diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index f63ba9c3b07fa..377ef9cd69de3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -144,7 +144,6 @@ public class NotificationPanelView extends PanelView implements public void setQsExpansionEnabled(boolean qsExpansionEnabled) { mQsExpansionEnabled = qsExpansionEnabled; - mHeader.setExpansionEnabled(qsExpansionEnabled); } public void closeQs() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 92eee4e6e8760..fa31b33438a42 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -240,8 +240,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, String mKeyguardHotwordPhrase = ""; int mKeyguardMaxNotificationCount; View mDateTimeView; - View mClearButton; - ImageView mHeaderFlipper; // carrier/wifi label private TextView mCarrierLabel; @@ -640,11 +638,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mKeyguardBottomArea.setActivityStarter(this); mKeyguardIndicationTextView = (KeyguardIndicationTextView) mStatusBarWindow.findViewById( R.id.keyguard_indication_text); - mClearButton = mStatusBarWindow.findViewById(R.id.clear_all_button); - mClearButton.setOnClickListener(mClearButtonListener); - mClearButton.setAlpha(0f); - mClearButton.setVisibility(View.INVISIBLE); - mClearButton.setEnabled(false); mDateView = (DateView)mStatusBarWindow.findViewById(R.id.date); mDateTimeView = mNotificationPanelHeader.findViewById(R.id.datetime); @@ -653,8 +646,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mDateTimeView.setEnabled(true); } - mHeaderFlipper = (ImageView) mStatusBarWindow.findViewById(R.id.header_flipper); - if (!mNotificationPanelIsFullScreenWidth) { mNotificationPanel.setSystemUiVisibility( View.STATUS_BAR_DISABLE_NOTIFICATION_ICONS | @@ -1118,19 +1109,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, if (mNavigationBarView != null) { mNavigationBarView.setLayoutDirection(layoutDirection); } - - if (mClearButton != null && mClearButton instanceof ImageView) { - // Force asset reloading - ((ImageView)mClearButton).setImageDrawable(null); - ((ImageView)mClearButton).setImageResource(R.drawable.ic_notify_clear); - } - - if (mHeaderFlipper != null) { - // Force asset reloading - mHeaderFlipper.setImageDrawable(null); - mHeaderFlipper.setImageResource(R.drawable.ic_notify_quicksettings); - } - refreshAllStatusBarIcons(); } @@ -1301,38 +1279,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, + " any=" + any + " clearable=" + clearable); } - if (mFlipSettingsView != null - && mFlipSettingsView.getVisibility() == View.VISIBLE - && mStackScroller.getVisibility() != View.VISIBLE) { - // the flip settings panel is unequivocally showing; we should not be shown - mClearButton.setVisibility(View.INVISIBLE); - } else if (mClearButton.isShown()) { - if (clearable != (mClearButton.getAlpha() == 1.0f)) { - ObjectAnimator clearAnimation = ObjectAnimator.ofFloat( - mClearButton, "alpha", clearable ? 1.0f : 0.0f).setDuration(250); - clearAnimation.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - if (mClearButton.getAlpha() <= 0.0f) { - mClearButton.setVisibility(View.INVISIBLE); - } - } - - @Override - public void onAnimationStart(Animator animation) { - if (mClearButton.getAlpha() <= 0.0f) { - mClearButton.setVisibility(View.VISIBLE); - } - } - }); - clearAnimation.start(); - } - } else { - mClearButton.setAlpha(clearable ? 1.0f : 0.0f); - mClearButton.setVisibility(clearable ? View.VISIBLE : View.INVISIBLE); - } - mClearButton.setEnabled(clearable); - final View nlo = mStatusBarView.findViewById(R.id.notification_lights_out); final boolean showDot = (any&&!areLightsOn()); if (showDot != (nlo.getAlpha() == 1.0f)) { @@ -2449,10 +2395,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, final Context context = mContext; final Resources res = context.getResources(); - if (mClearButton instanceof TextView) { - ((TextView)mClearButton).setText(context.getText(R.string.status_bar_clear_all_button)); - } - // Update the QuickSettings container if (mQS != null) mQS.updateResources(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java index 9d33930a17466..fd53d1581d2b9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java @@ -32,7 +32,6 @@ public class StatusBarHeaderView extends RelativeLayout { private boolean mExpanded; private View mBackground; - private View mFlipper; private int mCollapsedHeight; private int mExpandedHeight; @@ -45,7 +44,6 @@ public class StatusBarHeaderView extends RelativeLayout { protected void onFinishInflate() { super.onFinishInflate(); mBackground = findViewById(R.id.background); - mFlipper = findViewById(R.id.header_flipper); loadDimens(); } @@ -73,10 +71,6 @@ public class StatusBarHeaderView extends RelativeLayout { } } - public void setExpansionEnabled(boolean enabled) { - mFlipper.setVisibility(enabled ? View.VISIBLE : View.GONE); - } - public void setExpansion(float height) { if (height < mCollapsedHeight) { height = mCollapsedHeight;