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

ViewGroup.java: fix code style

Browse Source
This commit is contained in:
Mis012
2024-03-14 12:36:06 +01:00
parent 75e42e6bff
commit 8ad7359941
1 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/api-impl/android/view/ViewGroup.java
View File

@@ -158,7 +158,7 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
return true; return true;
} }
public LayoutTransition getLayoutTransition() {return null;} public LayoutTransition getLayoutTransition() { return null; }
public static int getChildMeasureSpec(int spec, int padding, int childDimension) { public static int getChildMeasureSpec(int spec, int padding, int childDimension) {
int specMode = MeasureSpec.getMode(spec); int specMode = MeasureSpec.getMode(spec);
@@ -210,30 +210,28 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
} else if (childDimension == LayoutParams.MATCH_PARENT) { } else if (childDimension == LayoutParams.MATCH_PARENT) {
// Child wants to be our size... find out how big it should // Child wants to be our size... find out how big it should
// be // be
resultSize = 0; //View.sUseZeroUnspecifiedMeasureSpec ? 0 : size; resultSize = 0; // View.sUseZeroUnspecifiedMeasureSpec ? 0 : size;
resultMode = MeasureSpec.UNSPECIFIED; resultMode = MeasureSpec.UNSPECIFIED;
} else if (childDimension == LayoutParams.WRAP_CONTENT) { } else if (childDimension == LayoutParams.WRAP_CONTENT) {
// Child wants to determine its own size.... find out how // Child wants to determine its own size.... find out how
// big it should be // big it should be
resultSize = 0; //View.sUseZeroUnspecifiedMeasureSpec ? 0 : size; resultSize = 0; // View.sUseZeroUnspecifiedMeasureSpec ? 0 : size;
resultMode = MeasureSpec.UNSPECIFIED; resultMode = MeasureSpec.UNSPECIFIED;
} }
break; break;
} }
//noinspection ResourceType // noinspection ResourceType
return MeasureSpec.makeMeasureSpec(resultSize, resultMode); return MeasureSpec.makeMeasureSpec(resultSize, resultMode);
} }
protected void measureChildWithMargins(View child, protected void measureChildWithMargins(View child,
int parentWidthMeasureSpec, int widthUsed, int parentWidthMeasureSpec, int widthUsed,
int parentHeightMeasureSpec, int heightUsed) { int parentHeightMeasureSpec, int heightUsed) {
final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams(); final MarginLayoutParams lp = (MarginLayoutParams)child.getLayoutParams();
final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec, final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec,
/*mPaddingLeft + mPaddingRight +*/ lp.leftMargin + lp.rightMargin /*mPaddingLeft + mPaddingRight +*/ lp.leftMargin + lp.rightMargin + widthUsed, lp.width);
+ widthUsed, lp.width);
final int childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec, final int childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec,
/*mPaddingTop + mPaddingBottom +*/ lp.topMargin + lp.bottomMargin /*mPaddingTop + mPaddingBottom +*/ lp.topMargin + lp.bottomMargin + heightUsed, lp.height);
+ heightUsed, lp.height);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
} }
@@ -241,17 +239,17 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
int parentHeightMeasureSpec) { int parentHeightMeasureSpec) {
final LayoutParams lp = child.getLayoutParams(); final LayoutParams lp = child.getLayoutParams();
final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec, final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec,
/*mPaddingLeft + mPaddingRight*/0, lp.width); /*mPaddingLeft + mPaddingRight*/ 0, lp.width);
final int childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec, final int childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec,
/*mPaddingTop + mPaddingBottom*/0, lp.height); /*mPaddingTop + mPaddingBottom*/ 0, lp.height);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
} }
public void setAddStatesFromChildren(boolean addsStates) {} public void setAddStatesFromChildren(boolean addsStates) {}
public View getFocusedChild() {return null;} public View getFocusedChild() { return null; }
public int getDescendantFocusability() {return 0;} public int getDescendantFocusability() { return 0; }
public void startViewTransition(View view) {} public void startViewTransition(View view) {}
public void endViewTransition(View view) {} public void endViewTransition(View view) {}
@@ -353,7 +351,7 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
/** /**
* Used to animate layouts. * Used to animate layouts.
*/ */
// public LayoutAnimationController.AnimationParameters layoutAnimationParameters; //public LayoutAnimationController.AnimationParameters layoutAnimationParameters;
} }
public static class MarginLayoutParams extends ViewGroup.LayoutParams { public static class MarginLayoutParams extends ViewGroup.LayoutParams {
@@ -416,6 +414,5 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
} }
public interface OnHierarchyChangeListener { public interface OnHierarchyChangeListener {
} }
} }