diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:50:52 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:50:52 -0800 |
| commit | 10c07f778a611d8723619f67e5709cbd9e502a07 (patch) | |
| tree | 2747712ffb2d61348ec7b241d0c2a764397a07a5 /core/res/res/layout | |
| parent | 45c11b1020a64aae88b859870d5b2e312dab4f76 (diff) | |
| parent | 4d70bd7a928903b35c92619437c70bc382587b71 (diff) | |
| download | frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.zip frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.tar.gz frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/base into cm-13.0
Android 6.0.1 release 3
Change-Id: I59b9e5a943e0860d43bcfb36ee0e8b8b072412ea
Diffstat (limited to 'core/res/res/layout')
| -rw-r--r-- | core/res/res/layout/chooser_grid.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/resolve_grid_item.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml index 2a3fa8a..c969060 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -85,7 +85,7 @@ <ListView android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:id="@+id/resolver_list" android:clipToPadding="false" android:scrollbarStyle="outsideOverlay" diff --git a/core/res/res/layout/resolve_grid_item.xml b/core/res/res/layout/resolve_grid_item.xml index 1c496f6..0a7ac77 100644 --- a/core/res/res/layout/resolve_grid_item.xml +++ b/core/res/res/layout/resolve_grid_item.xml @@ -70,6 +70,7 @@ android:minLines="2" android:maxLines="2" android:gravity="top|center_horizontal" - android:ellipsize="marquee" /> + android:ellipsize="marquee" + android:visibility="gone" /> </LinearLayout> |