Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2012-09-18 13:33:20 -07:00
committed by Android (Google) Code Review
parent a21636074a 6e5fe432f3
commit 63bcc14c43
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/res/layout/status_bar_expanded_header.xml
View File

@@ -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"

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

@@ -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);
mSettingsButton.setOnClickListener(mSettingsButtonListener);
mRotationButton = (RotationToggle) mStatusBarWindow.findViewById(R.id.rotation_lock_button);
if (mSettingsButton != null) {
mSettingsButton.setOnClickListener(mSettingsButtonListener);
}
mScrollView = (ScrollView)mStatusBarWindow.findViewById(R.id.scroll);
mScrollView.setVerticalScrollBarEnabled(false); // less drawing during pulldowns
@@ -819,7 +819,9 @@ public class PhoneStatusBar extends BaseStatusBar {
}
}
mSettingsButton.setEnabled(isDeviceProvisioned());
if (mSettingsButton != null) {
mSettingsButton.setEnabled(isDeviceProvisioned());
}
}
@Override