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

Commit cb1ec20a authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 63bcc14c: Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev 

* commit '63bcc14c':
  Remove settings and rotation buttons from notification panel.
parents 1d27cd2b 63bcc14c

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+0 −17
Original line number Diff line number Diff line
@@ -42,23 +42,6 @@ 
        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"

        />



    <com.android.systemui.statusbar.RotationToggle android:id="@+id/rotation_lock_button"

        android:layout_width="32dp"

        android:layout_height="32dp"

        android:layout_margin="8dp"

        android:button="@drawable/ic_notify_rotation"

        android:contentDescription="@string/accessibility_rotation_lock_off"

        android:clickable="true"

        />



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

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="center"

        android:src="@drawable/ic_notify_quicksettings"

        android:contentDescription="@string/accessibility_settings_button"

        />



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

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

+6 −4
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ public class PhoneStatusBar extends BaseStatusBar { 
    // top bar

    View mClearButton;

    View mSettingsButton;

    RotationToggle mRotationButton;



    // carrier/wifi label

    private TextView mCarrierLabel;
@@ -365,8 +364,9 @@ public class PhoneStatusBar extends BaseStatusBar { 
        mClearButton.setEnabled(false);

        mDateView = (DateView)mStatusBarWindow.findViewById(R.id.date);

        mSettingsButton = mStatusBarWindow.findViewById(R.id.settings_button);

        if (mSettingsButton != null) {

            mSettingsButton.setOnClickListener(mSettingsButtonListener);

        mRotationButton = (RotationToggle) mStatusBarWindow.findViewById(R.id.rotation_lock_button);

        }

        

        mScrollView = (ScrollView)mStatusBarWindow.findViewById(R.id.scroll);

        mScrollView.setVerticalScrollBarEnabled(false); // less drawing during pulldowns
@@ -819,8 +819,10 @@ public class PhoneStatusBar extends BaseStatusBar { 
            }

        }



        if (mSettingsButton != null) {

            mSettingsButton.setEnabled(isDeviceProvisioned());

        }

    }



    @Override

    protected void updateNotificationIcons() {