atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

use AndroidLayout class also in View implementation

Browse Source 
drop the onMeasure hack from WrapperWidget
This commit is contained in:
Julian Winkler
2023-10-31 23:02:11 +01:00
committed by Julian Winkler
parent 3c03223085
commit 0a8b8a3874
4 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api-impl/android/content/Context.java
View File

@@ -88,6 +88,7 @@ public class Context extends Object {
InputStream inStream = ClassLoader.getSystemClassLoader().getResourceAsStream("AndroidManifest.xml");
try {
manifest = AndroidManifestBlock.load(inStream);
application_info.targetSdkVersion = manifest.getTargetSdkVersion();
} catch (IOException e) {
e.printStackTrace();
}

12
src/api-impl/android/view/View.java
View File

@@ -809,9 +809,10 @@ public class View extends Object {
private int oldWidthMeasureSpec;
private int oldHeightMeasureSpec;
private boolean layoutRequested;
private boolean layoutRequested = true;
private int oldWidth;
private int oldHeight;
private boolean haveCustomMeasure;
public View() {
this(Context.this_application);
@@ -951,7 +952,10 @@ public class View extends Object {
};
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
native_measure(widget, widthMeasureSpec, heightMeasureSpec, false);
if (haveCustomMeasure) // calling native_measure here would create infinite loop
setMeasuredDimension(getDefaultSize(getSuggestedMinimumWidth(), widthMeasureSpec), getDefaultSize(getSuggestedMinimumHeight(), heightMeasureSpec));
else
native_measure(widget, widthMeasureSpec, heightMeasureSpec, false);
}
public void setPressed(boolean pressed) {
@@ -1121,10 +1125,10 @@ public class View extends Object {
}
protected int getSuggestedMinimumHeight() {
return 50;
return 10;
}
protected int getSuggestedMinimumWidth() {
return 100;
return 10;
}
/**