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

Merge "Fix race condition in status bar init code." into ics-mr1

Browse Source
This commit is contained in:
Daniel Sandler
2011-10-27 17:54:50 -07:00
committed by Android (Google) Code Review
parent ade26e2e38 6e8db88b4b
commit d939dd2eaa
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,7 @@ public class PhoneStatusBar extends StatusBar {
mWindowManager = IWindowManager.Stub.asInterface( mWindowManager = IWindowManager.Stub.asInterface(
ServiceManager.getService(Context.WINDOW_SERVICE)); ServiceManager.getService(Context.WINDOW_SERVICE));
super.start(); super.start(); // calls makeStatusBarView()
addNavigationBar(); addNavigationBar();
@@ -270,12 +270,7 @@ public class PhoneStatusBar extends StatusBar {
Resources res = context.getResources(); Resources res = context.getResources();
mDisplay.getMetrics(mDisplayMetrics); updateDisplaySize(); // populates mDisplayMetrics
if (DEBUG) {
Slog.d(TAG, "makeStatusBarView: mDisplayMetrics=" + mDisplayMetrics);
mDisplayMetrics = res.getDisplayMetrics();
Slog.d(TAG, "makeStatusBarView: mDisplayMetrics2=" + mDisplayMetrics);
}
loadDimens(); loadDimens();
mIconSize = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_icon_size); mIconSize = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_icon_size);
@@ -1793,6 +1788,11 @@ public class PhoneStatusBar extends StatusBar {
} }
void onBarViewAttached() { void onBarViewAttached() {
// The status bar has just been attached to the view hierarchy; it's possible that the
// screen has rotated in-between when we set up the window and now, so let's double-check
// the display metrics just in case.
updateDisplaySize();
WindowManager.LayoutParams lp; WindowManager.LayoutParams lp;
int pixelFormat; int pixelFormat;
Drawable bg; Drawable bg;