Merge "sysui: refactor PhoneStatusBar" (8c24cc13) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		Display mDisplay;
		Point mCurrentDisplaySize = new Point();

		StatusBarWindowView mStatusBarWindow;
		protected StatusBarWindowView mStatusBarWindow;
		PhoneStatusBarView mStatusBarView;
		private int mStatusBarWindowState = WINDOW_STATE_SHOWING;
		protected StatusBarWindowManager mStatusBarWindowManager;
		@@ -673,8 +673,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		updateDisplaySize(); // populates mDisplayMetrics
		updateResources();

		mStatusBarWindow = (StatusBarWindowView) View.inflate(context,
		R.layout.super_status_bar, null);
		inflateStatusBarWindow(context);
		mStatusBarWindow.setService(this);
		mStatusBarWindow.setOnTouchListener(new View.OnTouchListener() {
		@Override
		@@ -935,6 +934,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		return mStatusBarView;
		}

		protected void inflateStatusBarWindow(Context context) {
		mStatusBarWindow = (StatusBarWindowView) View.inflate(context,
		R.layout.super_status_bar, null);
		}

		protected void createNavigationBarView(Context context) {
		inflateNavigationBarView(context);
		mNavigationBarView.setDisabledFlags(mDisabled1);