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

ImageButton: set the defStyleAttr

Browse Source
This commit is contained in:
Julian Winkler
2024-12-20 17:08:10 +01:00
parent 2e11934bcf
commit f9db8faebd
2 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -904,83 +904,81 @@ public class View implements Drawable.Callback {
widget = native_constructor(context, attrs); widget = native_constructor(context, attrs);
if (attrs != null) { TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.View, defStyle, defStyleRes);
TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.View, defStyle, defStyleRes); this.id = a.getResourceId(com.android.internal.R.styleable.View_id, View.NO_ID);
this.id = a.getResourceId(com.android.internal.R.styleable.View_id, View.NO_ID); if (a.hasValue(com.android.internal.R.styleable.View_background)) {
if (a.hasValue(com.android.internal.R.styleable.View_background)) { try {
try { Drawable background = a.getDrawable(com.android.internal.R.styleable.View_background);
Drawable background = a.getDrawable(com.android.internal.R.styleable.View_background);
if(background != null) { if(background != null) {
if(background instanceof ColorDrawable) { if(background instanceof ColorDrawable) {
setBackgroundColor(((ColorDrawable)background).getColor()); setBackgroundColor(((ColorDrawable)background).getColor());
} else { } else {
setBackgroundDrawable(background); setBackgroundDrawable(background);
}
}
} catch (Exception e) { e.printStackTrace(); }
}
if (a.hasValue(com.android.internal.R.styleable.View_visibility)) {
setVisibility(VISIBILITY_FLAGS[a.getInt(com.android.internal.R.styleable.View_visibility, 0)]);
}
if (a.hasValue(com.android.internal.R.styleable.View_minWidth)) {
minWidth = a.getDimensionPixelSize(com.android.internal.R.styleable.View_minWidth, 0);
}
if (a.hasValue(com.android.internal.R.styleable.View_minHeight)) {
minHeight = a.getDimensionPixelSize(com.android.internal.R.styleable.View_minHeight, 0);
}
int padding = a.getDimensionPixelSize(com.android.internal.R.styleable.View_padding, -1);
int paddingVertical = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingVertical, -1);
int paddingHorizontal = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingHorizontal, -1);
int paddingStart = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingStart, -1);
int paddingEnd = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingEnd, -1);
if(padding >= 0) {
paddingLeft = padding;
paddingTop = padding;
paddingRight = padding;
paddingBottom = padding;
} else {
if(paddingVertical >= 0) {
paddingTop = paddingVertical;
paddingBottom = paddingVertical;
} else {
paddingTop = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingTop, 0);
paddingBottom = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingBottom, 0);
}
if(paddingHorizontal >= 0) {
paddingLeft = paddingHorizontal;
paddingRight = paddingHorizontal;
} else {
paddingLeft = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingLeft, 0);
paddingRight = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingRight, 0);
if(paddingStart >= 0) {
paddingLeft = paddingStart;
}
if(paddingEnd >= 0) {
paddingRight = paddingEnd;
} }
} }
} } catch (Exception e) { e.printStackTrace(); }
native_setPadding(widget, paddingLeft, paddingTop, paddingRight, paddingBottom);
if (a.hasValue(com.android.internal.R.styleable.View_tag)) {
tag = a.getText(com.android.internal.R.styleable.View_tag);
}
if(a.hasValue(com.android.internal.R.styleable.View_textAlignment)) {
int textAlignment = a.getInt(com.android.internal.R.styleable.View_textAlignment, 0);
setTextAlignment(textAlignment);
}
a.recycle();
} }
if (a.hasValue(com.android.internal.R.styleable.View_visibility)) {
setVisibility(VISIBILITY_FLAGS[a.getInt(com.android.internal.R.styleable.View_visibility, 0)]);
}
if (a.hasValue(com.android.internal.R.styleable.View_minWidth)) {
minWidth = a.getDimensionPixelSize(com.android.internal.R.styleable.View_minWidth, 0);
}
if (a.hasValue(com.android.internal.R.styleable.View_minHeight)) {
minHeight = a.getDimensionPixelSize(com.android.internal.R.styleable.View_minHeight, 0);
}
int padding = a.getDimensionPixelSize(com.android.internal.R.styleable.View_padding, -1);
int paddingVertical = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingVertical, -1);
int paddingHorizontal = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingHorizontal, -1);
int paddingStart = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingStart, -1);
int paddingEnd = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingEnd, -1);
if(padding >= 0) {
paddingLeft = padding;
paddingTop = padding;
paddingRight = padding;
paddingBottom = padding;
} else {
if(paddingVertical >= 0) {
paddingTop = paddingVertical;
paddingBottom = paddingVertical;
} else {
paddingTop = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingTop, 0);
paddingBottom = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingBottom, 0);
}
if(paddingHorizontal >= 0) {
paddingLeft = paddingHorizontal;
paddingRight = paddingHorizontal;
} else {
paddingLeft = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingLeft, 0);
paddingRight = a.getDimensionPixelSize(com.android.internal.R.styleable.View_paddingRight, 0);
if(paddingStart >= 0) {
paddingLeft = paddingStart;
}
if(paddingEnd >= 0) {
paddingRight = paddingEnd;
}
}
}
native_setPadding(widget, paddingLeft, paddingTop, paddingRight, paddingBottom);
if (a.hasValue(com.android.internal.R.styleable.View_tag)) {
tag = a.getText(com.android.internal.R.styleable.View_tag);
}
if(a.hasValue(com.android.internal.R.styleable.View_textAlignment)) {
int textAlignment = a.getInt(com.android.internal.R.styleable.View_textAlignment, 0);
setTextAlignment(textAlignment);
}
a.recycle();
onCreateDrawableState(0); onCreateDrawableState(0);
} }

4
src/api-impl/android/widget/ImageButton.java
View File

@@ -6,11 +6,11 @@ import android.util.AttributeSet;
public class ImageButton extends ImageView { public class ImageButton extends ImageView {
public ImageButton(Context context) { public ImageButton(Context context) {
super(context); this(context, null);
} }
public ImageButton(Context context, AttributeSet attributeSet) { public ImageButton(Context context, AttributeSet attributeSet) {
super(context, attributeSet); super(context, attributeSet, com.android.internal.R.attr.imageButtonStyle);
} }
public ImageButton(Context context, AttributeSet attributeSet, int defStyleAttr) { public ImageButton(Context context, AttributeSet attributeSet, int defStyleAttr) {