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

Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev

Browse Source 
am: 736a525

* commit '736a52538a9072a96dab02c14c89bb2e0a92c645':
  Fix sw legacy compat path in SurfaceView

Change-Id: I6d5961535ce22cf699478e28dd1b6c3e0d6e1379
This commit is contained in:
John Reck
2016-04-15 22:34:17 +00:00
committed by android-build-merger
parent 469ae333a4 736a52538a
commit 8fdfaf3812
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -648,13 +648,19 @@ public class SurfaceView extends View {
transformFromViewToWindowSpace(mLocation); transformFromViewToWindowSpace(mLocation);
mWinFrame.set(mWindowSpaceLeft, mWindowSpaceTop,
mLocation[0], mLocation[1]);
if (mTranslator != null) {
mTranslator.translateRectInAppWindowToScreen(mWinFrame);
}
try { try {
Log.d(TAG, String.format("updateWindowPosition UI, " + Log.d(TAG, String.format("updateWindowPosition UI, " +
"postion = [%d, %d, %d, %d]", mWindowSpaceLeft, mWindowSpaceTop, "postion = [%d, %d, %d, %d]", mWinFrame.left, mWinFrame.top,
mLocation[0], mLocation[1])); mWinFrame.right, mWinFrame.bottom));
mSession.repositionChild(mWindow, mWindowSpaceLeft, mWindowSpaceTop, mSession.repositionChild(mWindow, mWinFrame.left, mWinFrame.top,
mLocation[0], mLocation[1], mWinFrame.right, mWinFrame.bottom, -1, mWinFrame);
-1, mWinFrame);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Exception from relayout", ex); Log.e(TAG, "Exception from relayout", ex);
} }