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/res/values/attrs.xml | |
| 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/res/values/attrs.xml')
| -rw-r--r-- | library/main/res/values/attrs.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index 0339469..ec6489e 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -39,6 +39,7 @@ </attr> <attr name="suwCardBackground" format="color|reference" /> + <attr name="suwFillContentLayoutStyle" format="reference" /> <attr name="suwDividerCondition"> <enum name="either" value="0" /> <enum name="both" value="1" /> @@ -103,11 +104,16 @@ <attr name="suwStatusBarBackground" format="color|reference" /> </declare-styleable> - <declare-styleable name="SuwMaxSizeFrameLayout"> + <declare-styleable name="SuwIntrinsicSizeFrameLayout"> <attr name="android:height" /> <attr name="android:width" /> </declare-styleable> + <declare-styleable name="SuwFillContentLayout"> + <attr name="android:maxHeight" /> + <attr name="android:maxWidth" /> + </declare-styleable> + <declare-styleable name="SuwSetupWizardLayout"> <attr name="suwBackground" format="color|reference" /> <attr name="suwBackgroundTile" format="color|reference" /> |