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

Merge "Properly layout InlineContentView" into rvc-dev am: 7f70f707b5

Browse Source 
Change-Id: Ie0c6153c5b6c7e85fa5fd5a328653bae91c720d1
This commit is contained in:
TreeHugger Robot
2020-03-31 05:55:14 +00:00
committed by Automerger Merge Worker
parent 6259ba9842 7f70f707b5
commit 5ae0e88de6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/inline/InlineContentView.java
View File

@@ -160,7 +160,7 @@ public class InlineContentView extends ViewGroup {
@Override @Override
public void onLayout(boolean changed, int l, int t, int r, int b) { public void onLayout(boolean changed, int l, int t, int r, int b) {
mSurfaceView.layout(l, t, r, b); mSurfaceView.layout(0, 0, getMeasuredWidth(), getMeasuredHeight());
} }
/** /**

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

@@ -45,6 +45,10 @@ import android.view.ViewGroup;
* under the hosting window which could be useful in some cases, e.g. animating transitions. * under the hosting window which could be useful in some cases, e.g. animating transitions.
* At this point the inlined content will not be interactive and the touch events would * At this point the inlined content will not be interactive and the touch events would
* be delivered to your app. * be delivered to your app.
* <p>
* Instances of this class are created by the platform and can be programmatically attached
* to your UI. Once you attach and detach this view it can not longer be reused and you
* should obtain a new view from the platform via the dedicated APIs.
*/ */
public class InlineContentView extends ViewGroup { public class InlineContentView extends ViewGroup {
@@ -157,7 +161,7 @@ public class InlineContentView extends ViewGroup {
@Override @Override
public void onLayout(boolean changed, int l, int t, int r, int b) { public void onLayout(boolean changed, int l, int t, int r, int b) {
mSurfaceView.layout(l, t, r, b); mSurfaceView.layout(0, 0, getMeasuredWidth(), getMeasuredHeight());
} }
/** /**