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

Merge "Work around instability of Display.getRotation()." into jb-mr1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-08-31 12:06:41 -07:00
committed by Android (Google) Code Review
parent 6beee2694c 7f3cf9586e
commit 8c890f8a69
1 changed files with 9 additions and 5 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

@@ -451,6 +451,7 @@ public class PhoneStatusBar extends BaseStatusBar {
filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_SCREEN_OFF);
filter.addAction(Intent.ACTION_SCREEN_ON);
context.registerReceiver(mBroadcastReceiver, filter); context.registerReceiver(mBroadcastReceiver, filter);
return mStatusBarView; return mStatusBarView;
@@ -788,11 +789,6 @@ public class PhoneStatusBar extends BaseStatusBar {
setAreThereNotifications(); setAreThereNotifications();
} }
@Override
protected void onConfigurationChanged(Configuration newConfig) {
updateShowSearchHoldoff();
}
private void updateShowSearchHoldoff() { private void updateShowSearchHoldoff() {
mShowSearchHoldoff = mContext.getResources().getInteger( mShowSearchHoldoff = mContext.getResources().getInteger(
R.integer.config_show_search_delay); R.integer.config_show_search_delay);
@@ -1804,9 +1800,17 @@ public class PhoneStatusBar extends BaseStatusBar {
makeExpandedInvisible(); makeExpandedInvisible();
} }
else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) { else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) {
if (DEBUG) {
Slog.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());
}
updateResources(); updateResources();
repositionNavigationBar(); repositionNavigationBar();
updateExpandedViewPos(EXPANDED_LEAVE_ALONE); updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
updateShowSearchHoldoff();
}
else if (Intent.ACTION_SCREEN_ON.equals(action)) {
// work around problem where mDisplay.getRotation() is not stable while screen is off (bug 7086018)
repositionNavigationBar();
} }
} }
}; };