Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 564c03da authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Really hide the settings button on tablets." into jb-mr1-dev

parents 39c65262 7382a025

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -77,16 +77,16 @@ 
    <ImageView android:id="@+id/clear_all_button"

    <ImageView android:id="@+id/clear_all_button"

        android:layout_width="50dp"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:layout_height="50dp"

        android:layout_marginRight="12dp"

        android:scaleType="center"

        android:scaleType="center"

        android:src="@drawable/ic_notify_clear"

        android:src="@drawable/ic_notify_clear"

        android:background="@drawable/ic_notify_button_bg"

        android:background="@drawable/ic_notify_button_bg"

        android:contentDescription="@string/accessibility_clear_all"

        android:contentDescription="@string/accessibility_clear_all"

        />     

        />     





    <FrameLayout

    <FrameLayout android:id="@+id/settings_button_holder"

        android:layout_width="50dp"

        android:layout_width="50dp"

        android:layout_height="50dp"

        android:layout_height="50dp"

        android:layout_marginLeft="12dp"

        >

        >

        <ImageView android:id="@+id/settings_button"

        <ImageView android:id="@+id/settings_button"

            android:layout_width="50dp"

            android:layout_width="50dp"

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -452,7 +452,11 @@ public class PhoneStatusBar extends BaseStatusBar { 
                    mSettingsButton.setVisibility(View.VISIBLE);

                    mSettingsButton.setVisibility(View.VISIBLE);

                } else {

                } else {

                    // there is a settings panel, but it's on the other side of the (large) screen

                    // 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 {

            } else {

                // no settings panel, go straight to settings

                // no settings panel, go straight to settings