diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-01-13 15:52:01 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-01-13 15:52:01 -0500 |
| commit | 121dffcfe7f0569cc8cf4c7fb2468ff2272acfea (patch) | |
| tree | 9ac9cc15a2be009a66d2abdca28676989a5ee400 /res/layout | |
| parent | 8270c2a7da5c0f999547b62e17b17086566e4250 (diff) | |
| parent | 444fde482df92a318252660f56072316057d29f3 (diff) | |
| download | packages_apps_Browser-121dffcfe7f0569cc8cf4c7fb2468ff2272acfea.zip packages_apps_Browser-121dffcfe7f0569cc8cf4c7fb2468ff2272acfea.tar.gz packages_apps_Browser-121dffcfe7f0569cc8cf4c7fb2468ff2272acfea.tar.bz2 | |
resolved conflicts for merge of 444fde48 to master
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/browser_downloads_page.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/browser_downloads_page.xml b/res/layout/browser_downloads_page.xml index aa6a609..b6c0c46 100644 --- a/res/layout/browser_downloads_page.xml +++ b/res/layout/browser_downloads_page.xml @@ -19,8 +19,8 @@ */ --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <ListView - android:id="@+id/list" + <ExpandableListView + android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent"/> <ViewStub |