diff options
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 03f03e23fcf3..b044db7db59a 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -77,16 +77,16 @@ <ImageView android:id="@+id/clear_all_button" android:layout_width="50dp" android:layout_height="50dp" - android:layout_marginRight="12dp" android:scaleType="center" android:src="@drawable/ic_notify_clear" android:background="@drawable/ic_notify_button_bg" android:contentDescription="@string/accessibility_clear_all" /> - <FrameLayout + <FrameLayout android:id="@+id/settings_button_holder" android:layout_width="50dp" android:layout_height="50dp" + android:layout_marginLeft="12dp" > <ImageView android:id="@+id/settings_button" android:layout_width="50dp" 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 41ccf3965112..023d673590dd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -452,7 +452,11 @@ public class PhoneStatusBar extends BaseStatusBar { mSettingsButton.setVisibility(View.VISIBLE); } else { // there is a settings panel, but it's on the other side of the (large) screen - mSettingsButton.setVisibility(View.GONE); + final View buttonHolder = mStatusBarWindow.findViewById( + R.id.settings_button_holder); + if (buttonHolder != null) { + buttonHolder.setVisibility(View.GONE); + } } } else { // no settings panel, go straight to settings |