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

Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2

Browse Source
This commit is contained in:
Dianne Hackborn
2011-06-08 22:33:34 -07:00
committed by Android (Google) Code Review
parent e22fe9331a 48a7651823
commit 5ba2e872fa
3 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/WindowManagerImpl.java
View File

@@ -342,9 +342,11 @@ public class WindowManagerImpl implements WindowManager {
return view;
}
InputMethodManager imm = InputMethodManager.getInstance(view.getContext());
if (imm != null) {
imm.windowDismissed(mViews[index].getWindowToken());
if (view != null) {
InputMethodManager imm = InputMethodManager.getInstance(view.getContext());
if (imm != null) {
imm.windowDismissed(mViews[index].getWindowToken());
}
}
root.die(false);
finishRemoveViewLocked(view, index);
@@ -368,9 +370,11 @@ public class WindowManagerImpl implements WindowManager {
removeItem(tmpParams, mParams, index);
mParams = tmpParams;
view.assignParent(null);
// func doesn't allow null... does it matter if we clear them?
//view.setLayoutParams(null);
if (view != null) {
view.assignParent(null);
// func doesn't allow null... does it matter if we clear them?
//view.setLayoutParams(null);
}
}
public void closeAll(IBinder token, String who, String what) {

5
packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java
View File

@@ -54,8 +54,9 @@ public class CompatModeButton extends ImageView implements View.OnClickListener
}
public void refresh() {
setVisibility(
(mAM.getFrontActivityScreenCompatMode() == ActivityManager.COMPAT_MODE_NEVER)
int mode = mAM.getFrontActivityScreenCompatMode();
setVisibility((mode == ActivityManager.COMPAT_MODE_NEVER
|| mode == ActivityManager.COMPAT_MODE_ALWAYS)
? View.GONE
: View.VISIBLE
);

36
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -466,6 +466,7 @@ public class WindowManagerService extends IWindowManager.Stub
Display mDisplay;
final DisplayMetrics mDisplayMetrics = new DisplayMetrics();
final DisplayMetrics mTmpDisplayMetrics = new DisplayMetrics();
final DisplayMetrics mCompatDisplayMetrics = new DisplayMetrics();
H mH = new H();
@@ -5549,6 +5550,36 @@ public class WindowManagerService extends IWindowManager.Stub
return sw;
}
private int reduceCompatConfigWidthSize(int curSize, int rotation, DisplayMetrics dm,
int dw, int dh) {
dm.unscaledWidthPixels = mPolicy.getNonDecorDisplayWidth(rotation, dw);
dm.unscaledHeightPixels = mPolicy.getNonDecorDisplayHeight(rotation, dh);
float scale = CompatibilityInfo.computeCompatibleScaling(dm, null);
int size = (int)(((dm.unscaledWidthPixels / scale) / dm.density) + .5f);
if (curSize == 0 || size < curSize) {
curSize = size;
}
return curSize;
}
private int computeCompatSmallestWidth(boolean rotated, DisplayMetrics dm, int dw, int dh) {
mTmpDisplayMetrics.setTo(dm);
dm = mTmpDisplayMetrics;
int unrotDw, unrotDh;
if (rotated) {
unrotDw = dh;
unrotDh = dw;
} else {
unrotDw = dw;
unrotDh = dh;
}
int sw = reduceCompatConfigWidthSize(0, Surface.ROTATION_0, dm, unrotDw, unrotDh);
sw = reduceCompatConfigWidthSize(sw, Surface.ROTATION_90, dm, unrotDh, unrotDw);
sw = reduceCompatConfigWidthSize(sw, Surface.ROTATION_180, dm, unrotDw, unrotDh);
sw = reduceCompatConfigWidthSize(sw, Surface.ROTATION_270, dm, unrotDh, unrotDw);
return sw;
}
boolean computeNewConfigurationLocked(Configuration config) {
if (mDisplay == null) {
return false;
@@ -5613,8 +5644,7 @@ public class WindowManagerService extends IWindowManager.Stub
config.compatScreenWidthDp = (int)(config.screenWidthDp / mCompatibleScreenScale);
config.compatScreenHeightDp = (int)(config.screenHeightDp / mCompatibleScreenScale);
config.compatSmallestScreenWidthDp = (int)(config.smallestScreenWidthDp
/ mCompatibleScreenScale);
config.compatSmallestScreenWidthDp = computeCompatSmallestWidth(rotated, dm, dw, dh);
// We need to determine the smallest width that will occur under normal
// operation. To this, start with the base screen size and compute the
@@ -8091,7 +8121,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (mDimAnimator == null) {
mDimAnimator = new DimAnimator(mFxSession);
}
mDimAnimator.show(dw, dh);
mDimAnimator.show(innerDw, innerDh);
mDimAnimator.updateParameters(mContext.getResources(),
w, currentTime);
}