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

Merge "AccessibilityNodeInfo bounds inconsistent with compatibility mode."

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-06-22 11:35:47 -07:00
committed by Android (Google) Code Review
parent 032897470a 7961be75f4
commit b5d578fbdb
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -32,6 +32,7 @@ import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.database.ContentObserver;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Binder;
import android.os.Handler;
@@ -814,6 +815,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
final AtomicInteger mInteractionIdCounter = new AtomicInteger();
final Rect mTempBounds = new Rect();
// the events pending events to be dispatched to this service
final SparseArray<AccessibilityEvent> mPendingEvents =
new SparseArray<AccessibilityEvent>();
@@ -932,9 +935,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
AccessibilityNodeInfo info = mCallback.getFindAccessibilityNodeInfoResultAndClear(
interactionId);
if (info != null) {
applyCompatibilityScaleIfNeeded(info);
info.setConnection(this);
info.setSealed(true);
}
info.setSealed(true);
return info;
} catch (RemoteException re) {
if (DEBUG) {
@@ -979,6 +983,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
final int infoCount = infos.size();
for (int i = 0; i < infoCount; i++) {
AccessibilityNodeInfo info = infos.get(i);
applyCompatibilityScaleIfNeeded(info);
info.setConnection(this);
info.setSealed(true);
}
@@ -1019,6 +1024,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
AccessibilityNodeInfo info =
mCallback.getFindAccessibilityNodeInfoResultAndClear(interactionId);
if (info != null) {
applyCompatibilityScaleIfNeeded(info);
info.setConnection(this);
info.setSealed(true);
}
@@ -1093,6 +1099,24 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
return mWindowIdToInteractionConnectionMap.get(windowId);
}
private void applyCompatibilityScaleIfNeeded(AccessibilityNodeInfo info) {
IBinder windowToken = mWindowIdToWindowTokenMap.get(info.getWindowId());
final float scale = mWindowManagerService.getWindowCompatibilityScale(windowToken);
if (Float.compare(scale, 1.0f) == 0) {
return;
}
Rect bounds = mTempBounds;
info.getBoundsInParent(bounds);
bounds.scale(scale);
info.setBoundsInParent(bounds);
info.getBoundsInScreen(bounds);
bounds.scale(scale);
info.setBoundsInScreen(bounds);
}
}
final class SecurityPolicy {

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

@@ -2776,6 +2776,13 @@ public class WindowManagerService extends IWindowManager.Stub
Binder.restoreCallingIdentity(origId);
}
public float getWindowCompatibilityScale(IBinder windowToken) {
synchronized (mWindowMap) {
WindowState windowState = mWindowMap.get(windowToken);
return (windowState != null) ? windowState.mGlobalScale : 1.0f;
}
}
private AttributeCache.Entry getCachedAnimations(WindowManager.LayoutParams lp) {
if (DEBUG_ANIM) Slog.v(TAG, "Loading animations: layout params pkg="
+ (lp != null ? lp.packageName : null)