diff options
author | Maurice Lam <yukl@google.com> | 2017-05-12 14:32:26 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2017-05-12 17:22:11 -0700 |
commit | 2da78450d5e9723ca93fa39bfdc3f8dd27b41e89 (patch) | |
tree | aaa15c458202e6776779b3f1ce27a17ed83eb84a /library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java | |
parent | e4aaa62e8f9b29e69d70668d9ce5da6ff7d35f5c (diff) | |
download | setupwizard-2da78450d5e9723ca93fa39bfdc3f8dd27b41e89.tar.gz |
Add layout to size illustrations
- Add FillContentLayout, which is a (frame)layout which, when set
to fill the remaining space of its parent, will make sure its
children are sized between minWidth/minHeight and
maxWidth/maxHeight.
- Renamed styleable SuwIntrinsicSizeFrameLayout to be consistent with
the name of the view that uses it.
Test: ./gradlew connectedAndroidTest test
Bug: 38210310
Change-Id: I5b2aa6cfe8b4a05843de25d39cae776609f3d161
Diffstat (limited to 'library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java')
-rw-r--r-- | library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java b/library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java index e9ab1a7..02fdcc7 100644 --- a/library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java +++ b/library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java @@ -56,11 +56,11 @@ public class IntrinsicSizeFrameLayout extends FrameLayout { private void init(Context context, AttributeSet attrs, int defStyleAttr) { final TypedArray a = context.obtainStyledAttributes(attrs, - R.styleable.SuwMaxSizeFrameLayout, defStyleAttr, 0); + R.styleable.SuwIntrinsicSizeFrameLayout, defStyleAttr, 0); mIntrinsicHeight = - a.getDimensionPixelSize(R.styleable.SuwMaxSizeFrameLayout_android_height, 0); + a.getDimensionPixelSize(R.styleable.SuwIntrinsicSizeFrameLayout_android_height, 0); mIntrinsicWidth = - a.getDimensionPixelSize(R.styleable.SuwMaxSizeFrameLayout_android_width, 0); + a.getDimensionPixelSize(R.styleable.SuwIntrinsicSizeFrameLayout_android_width, 0); a.recycle(); } |