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

Merge "Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e84 am: d00340e1a5 am: 439359869f" into rvc-qpr-dev-plus-aosp am: 23c9cc0cb7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978216

Change-Id: I6fca331224199adce27ff8b835d4c54c74a112b6
This commit is contained in:
Automerger Merge Worker
2020-06-24 17:44:39 +00:00
parent 463ffd4665 23c9cc0cb7
commit 67a228259c
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/SurfaceControl.java
View File

@@ -229,7 +229,7 @@ public final class SurfaceControl implements Parcelable {
int transformHint); int transformHint);
@Nullable @Nullable
@GuardedBy("sLock") @GuardedBy("mLock")
private ArrayList<OnReparentListener> mReparentListeners; private ArrayList<OnReparentListener> mReparentListeners;
/** /**

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

@@ -1231,7 +1231,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
float postScaleX, float postScaleY) { float postScaleX, float postScaleY) {
transaction.setPosition(surface, positionLeft, positionTop); transaction.setPosition(surface, positionLeft, positionTop);
transaction.setMatrix(surface, postScaleX /*dsdx*/, 0f /*dtdx*/, transaction.setMatrix(surface, postScaleX /*dsdx*/, 0f /*dtdx*/,
0f /*dsdy*/, postScaleY /*dtdy*/); 0f /*dtdy*/, postScaleY /*dsdy*/);
} }
/** @hide */ /** @hide */

3
core/java/android/widget/inline/InlineContentView.java
View File

@@ -156,8 +156,7 @@ public class InlineContentView extends ViewGroup {
@Override @Override
public void onDraw() { public void onDraw() {
computeParentPositionAndScale(); computeParentPositionAndScale();
final int visibility = InlineContentView.this.isShown() ? VISIBLE : GONE; mSurfaceView.setVisibility(VISIBLE);
mSurfaceView.setVisibility(visibility);
} }
}; };