diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-18 16:04:36 +0200 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2013-09-20 01:12:53 +0200 |
| commit | 998e4ff3dca60d65e94fa2ec4a35cb258124318b (patch) | |
| tree | faacde95f38543cda8b7223c41bf8db6fafe08ab /res/layout/wallpaper_picker.xml | |
| parent | 437dec39ee89ba6817967ae5bd75d663eecad5db (diff) | |
| download | android_packages_apps_Trebuchet-998e4ff3dca60d65e94fa2ec4a35cb258124318b.tar.gz android_packages_apps_Trebuchet-998e4ff3dca60d65e94fa2ec4a35cb258124318b.tar.bz2 android_packages_apps_Trebuchet-998e4ff3dca60d65e94fa2ec4a35cb258124318b.zip | |
Add live wallpapers and third-party pickers to bottom strip
Bug: 10742727
Bug: 10805463
Change-Id: I961344b34fff3b183380caf3508d23b05c1ca26c
Diffstat (limited to 'res/layout/wallpaper_picker.xml')
| -rw-r--r-- | res/layout/wallpaper_picker.xml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml index a0672f649..53c529c2a 100644 --- a/res/layout/wallpaper_picker.xml +++ b/res/layout/wallpaper_picker.xml @@ -50,10 +50,23 @@ <HorizontalScrollView android:layout_width="match_parent" android:layout_height="wrap_content" > - <LinearLayout android:id="@+id/wallpaper_list" - android:layout_width="match_parent" + <LinearLayout android:id="@+id/master_wallpaper_list" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" /> + android:orientation="horizontal" > + <LinearLayout android:id="@+id/third_party_wallpaper_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + <LinearLayout android:id="@+id/wallpaper_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + <LinearLayout android:id="@+id/live_wallpaper_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + </LinearLayout> </HorizontalScrollView> <View android:layout_width="match_parent" |