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

Merge "sysui: refactor PhoneStatusBar"

Browse Source
This commit is contained in:
Xiaohui Chen
2016-01-21 18:17:54 +00:00
committed by Android (Google) Code Review
parent e0a6d6ab8d 8bdcd1fcaa
commit 3691d64d6d
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
// These are no longer handled by the policy, because we need custom strategies for them
BluetoothControllerImpl mBluetoothController;
SecurityControllerImpl mSecurityController;
BatteryController mBatteryController;
protected BatteryController mBatteryController;
LocationControllerImpl mLocationController;
NetworkControllerImpl mNetworkController;
HotspotControllerImpl mHotspotController;
@@ -935,14 +935,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
protected void createNavigationBarView(Context context) {
// Optionally show app shortcuts in the nav bar "shelf" area.
if (shouldShowAppShelf()) {
mNavigationBarView = (NavigationBarView) View.inflate(
context, R.layout.navigation_bar_with_apps, null);
} else {
mNavigationBarView = (NavigationBarView) View.inflate(
context, R.layout.navigation_bar, null);
}
inflateNavigationBarView(context);
mNavigationBarView.setDisabledFlags(mDisabled1);
mNavigationBarView.setComponents(mRecents, getComponent(Divider.class));
mNavigationBarView.setOnVerticalChangedListener(
@@ -963,7 +956,18 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}});
}
private void initSignalCluster(View containerView) {
protected void inflateNavigationBarView(Context context) {
// Optionally show app shortcuts in the nav bar "shelf" area.
if (shouldShowAppShelf()) {
mNavigationBarView = (NavigationBarView) View.inflate(
context, R.layout.navigation_bar_with_apps, null);
} else {
mNavigationBarView = (NavigationBarView) View.inflate(
context, R.layout.navigation_bar, null);
}
}
protected void initSignalCluster(View containerView) {
SignalClusterView signalCluster =
(SignalClusterView) containerView.findViewById(R.id.signal_cluster);
if (signalCluster != null) {