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

Merge change 7613 into donut

Browse Source 
* changes:
   * Use Fede In/Out animation if one of opening/closing apps is in compatibility mode.  * preserve compatibility window flag when the app updates window's layout params.  * Added assertion in DEFAULT_COMPATIBILITY_INFO object to prevent unintentional modification.  * A few minor updates     * log/dump message improvement     * Removed unnecessary method in FadeInOutAnimator     * Fixed 100 char issue in WindwoManagerServer.java
This commit is contained in:
Android (Google) Code Review
2009-07-17 09:54:53 -07:00
parent 0e230c574b 5a2b91dc14
commit 54f0910138
4 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/res/CompatibilityInfo.java
View File

@@ -38,7 +38,12 @@ public class CompatibilityInfo {
private static final String TAG = "CompatibilityInfo";
/** default compatibility info object for compatible applications */
public static final CompatibilityInfo DEFAULT_COMPATIBILITY_INFO = new CompatibilityInfo();
public static final CompatibilityInfo DEFAULT_COMPATIBILITY_INFO = new CompatibilityInfo() {
@Override
public void setExpandable(boolean expandable) {
throw new UnsupportedOperationException("trying to change default compatibility info");
}
};
/**
* The default width of the screen in portrait mode.
@@ -191,7 +196,7 @@ public class CompatibilityInfo {
@Override
public String toString() {
return "CompatibilityInfo{scale=" + applicationScale +
", compatibility flag=" + mCompatibilityFlags + "}";
", supports screen=" + supportsScreen() + "}";
}
/**

9
core/java/android/view/ViewRoot.java
View File

@@ -497,8 +497,12 @@ public final class ViewRoot extends Handler implements ViewParent,
void setLayoutParams(WindowManager.LayoutParams attrs, boolean newView) {
synchronized (this) {
int oldSoftInputMode = mWindowAttributes.softInputMode;
// preserve compatible window flag if exists.
int compatibleWindowFlag =
mWindowAttributes.flags & WindowManager.LayoutParams.FLAG_COMPATIBLE_WINDOW;
mWindowAttributes.copyFrom(attrs);
mWindowAttributes.flags |= compatibleWindowFlag;
if (newView) {
mSoftInputMode = attrs.softInputMode;
requestLayout();
@@ -1301,7 +1305,8 @@ public final class ViewRoot extends Handler implements ViewParent,
if (DEBUG_DRAW) {
Context cxt = mView.getContext();
Log.i(TAG, "Drawing: package:" + cxt.getPackageName() +
", metrics=" + mView.getContext().getResources().getDisplayMetrics());
", metrics=" + cxt.getResources().getDisplayMetrics() +
", compatibilityInfo=" + cxt.getResources().getCompatibilityInfo());
}
int saveCount = canvas.save(Canvas.MATRIX_SAVE_FLAG);
try {

3
core/java/android/view/WindowManager.java
View File

@@ -986,6 +986,9 @@ public interface WindowManager extends ViewManager {
sb.append(" or=");
sb.append(screenOrientation);
}
if ((flags & FLAG_COMPATIBLE_WINDOW) != 0) {
sb.append(" compatible=true");
}
sb.append('}');
return sb.toString();
}

45
services/java/com/android/server/WindowManagerService.java
View File

@@ -1891,7 +1891,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
break;
case WindowManagerPolicy.TRANSIT_TASK_TO_BACK:
animAttr = enter
? com.android.internal.R.styleable.WindowAnimation_taskToBackEnterAnimation
? com.android.internal.R.styleable.WindowAnimation_taskToBackEnterAnimation
: com.android.internal.R.styleable.WindowAnimation_taskToBackExitAnimation;
break;
}
@@ -7232,17 +7232,27 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
public static WindowManager.LayoutParams findAnimations(
ArrayList<AppWindowToken> order,
ArrayList<AppWindowToken> tokenList1,
ArrayList<AppWindowToken> tokenList2) {
ArrayList<AppWindowToken> openingTokenList1,
ArrayList<AppWindowToken> closingTokenList2) {
// We need to figure out which animation to use...
// First, check if there is a compatible window in opening/closing
// apps, and use it if exists.
WindowManager.LayoutParams animParams = null;
int animSrc = 0;
animParams = findCompatibleWindowParams(openingTokenList1);
if (animParams == null) {
animParams = findCompatibleWindowParams(closingTokenList2);
}
if (animParams != null) {
return animParams;
}
//Log.i(TAG, "Looking for animations...");
for (int i=order.size()-1; i>=0; i--) {
AppWindowToken wtoken = order.get(i);
//Log.i(TAG, "Token " + wtoken + " with " + wtoken.windows.size() + " windows");
if (tokenList1.contains(wtoken) || tokenList2.contains(wtoken)) {
if (openingTokenList1.contains(wtoken) || closingTokenList2.contains(wtoken)) {
int j = wtoken.windows.size();
while (j > 0) {
j--;
@@ -7270,6 +7280,21 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
return animParams;
}
private static LayoutParams findCompatibleWindowParams(ArrayList<AppWindowToken> tokenList) {
for (int appCount = tokenList.size() - 1; appCount >= 0; appCount--) {
AppWindowToken wtoken = tokenList.get(appCount);
// Just checking one window is sufficient as all windows have the compatible flag
// if the application is in compatibility mode.
if (wtoken.windows.size() > 0) {
WindowManager.LayoutParams params = wtoken.windows.get(0).mAttrs;
if ((params.flags & FLAG_COMPATIBLE_WINDOW) != 0) {
return params;
}
}
}
return null;
}
// -------------------------------------------------------------
// DummyAnimation
// -------------------------------------------------------------
@@ -9277,16 +9302,10 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
// width is the screen width {@see AppWindowToken#stepAnimatinoLocked}
mWidth = width;
}
@Override
public boolean willChangeTransformationMatrix() {
return true;
}
@Override
public boolean willChangeBounds() {
return true;
public int getZAdjustment() {
return Animation.ZORDER_TOP;
}
}
}