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

Merge "sysui: small refactor and delete dead code"

Browse Source
This commit is contained in:
Xiaohui Chen
2016-01-19 19:25:53 +00:00
committed by Android (Google) Code Review
parent 34ac1d6c6f 109423039d
commit 78571980fa
2 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -231,6 +231,10 @@ public class NavigationBarView extends LinearLayout {
return mCurrentView;
}
public View[] getAllViews() {
return mRotatedViews;
}
public KeyButtonView getRecentsButton() {
return (KeyButtonView) getCurrentView().findViewById(R.id.recent_apps);
}
@@ -341,7 +345,6 @@ public class NavigationBarView extends LinearLayout {
// Update menu button in case the IME state has changed.
setMenuVisibility(mShowMenu, true);
setDisabledFlags(mDisabledFlags, true);
}
@@ -398,12 +401,6 @@ public class NavigationBarView extends LinearLayout {
}
}
private void setVisibleOrGone(View view, boolean visible) {
if (view != null) {
view.setVisibility(visible ? VISIBLE : GONE);
}
}
public void setLayoutTransitionsEnabled(boolean enabled) {
mLayoutTransitionsEnabled = enabled;
updateLayoutTransitionsEnabled();

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

@@ -495,7 +495,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
private final ShadeUpdates mShadeUpdates = new ShadeUpdates();
private int mDrawCount;
private Runnable mLaunchTransitionEndRunnable;
private boolean mLaunchTransitionFadingAway;
private ExpandableNotificationRow mDraggedDownRow;
@@ -670,8 +669,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
protected PhoneStatusBarView makeStatusBarView() {
final Context context = mContext;
Resources res = context.getResources();
updateDisplaySize(); // populates mDisplayMetrics
updateResources();
@@ -835,23 +832,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mZenModeController = mVolumeComponent.getZenController();
}
mCastController = new CastControllerImpl(mContext);
final SignalClusterView signalCluster =
(SignalClusterView) mStatusBarView.findViewById(R.id.signal_cluster);
final SignalClusterView signalClusterKeyguard =
(SignalClusterView) mKeyguardStatusBar.findViewById(R.id.signal_cluster);
final SignalClusterView signalClusterQs =
(SignalClusterView) mHeader.findViewById(R.id.signal_cluster);
mNetworkController.addSignalCallback(signalCluster);
mNetworkController.addSignalCallback(signalClusterKeyguard);
signalCluster.setSecurityController(mSecurityController);
signalCluster.setNetworkController(mNetworkController);
signalClusterKeyguard.setSecurityController(mSecurityController);
signalClusterKeyguard.setNetworkController(mNetworkController);
if (signalClusterQs != null) {
mNetworkController.addSignalCallback(signalClusterQs);
signalClusterQs.setSecurityController(mSecurityController);
signalClusterQs.setNetworkController(mNetworkController);
}
initSignalCluster(mStatusBarView);
initSignalCluster(mKeyguardStatusBar);
initSignalCluster(mHeader);
final boolean isAPhone = mNetworkController.hasVoiceCallingFeature();
if (isAPhone) {
mNetworkController.addEmergencyListener(mHeader);
@@ -977,6 +962,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}});
}
private void initSignalCluster(View containerView) {
SignalClusterView signalCluster =
(SignalClusterView) containerView.findViewById(R.id.signal_cluster);
if (signalCluster != null) {
mNetworkController.addSignalCallback(signalCluster);
signalCluster.setSecurityController(mSecurityController);
signalCluster.setNetworkController(mNetworkController);
}
}
/** Returns true if the app shelf should be shown in the nav bar. */
private boolean shouldShowAppShelf() {
// Allow adb to override the default shelf behavior: