diff options
author | Adam Lesinski <adamlesinski@google.com> | 2010-12-06 15:42:03 -0800 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2010-12-06 17:25:39 -0800 |
commit | d6bb51406fa63d93bf634b64e9f115e49a9c9c29 (patch) | |
tree | cbfb62607f9795300d6ea5e3b1f65492faa8891e /res | |
parent | 0ab0466df1edeb03700069a9989bf1ee30ce8fdf (diff) | |
download | android_packages_wallpapers_LivePicker-d6bb51406fa63d93bf634b64e9f115e49a9c9c29.tar.gz android_packages_wallpapers_LivePicker-d6bb51406fa63d93bf634b64e9f115e49a9c9c29.tar.bz2 android_packages_wallpapers_LivePicker-d6bb51406fa63d93bf634b64e9f115e49a9c9c29.zip |
Fixed bug in orientation change
-The Fragment was missing an empty public constructor
b/3257935
-Restructured some of the logic determining whether to
show a dialog or an embedded view
Change-Id: I42295ef88cd800b775ea6970c59c34cb46ca17d5
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-xlarge/live_wallpaper_base.xml | 19 | ||||
-rw-r--r-- | res/layout/live_wallpaper_base.xml | 8 |
2 files changed, 25 insertions, 2 deletions
diff --git a/res/layout-xlarge/live_wallpaper_base.xml b/res/layout-xlarge/live_wallpaper_base.xml new file mode 100644 index 0000000..a8e61d5 --- /dev/null +++ b/res/layout-xlarge/live_wallpaper_base.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" /> diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml index 6803901..41cbdf1 100644 --- a/res/layout/live_wallpaper_base.xml +++ b/res/layout/live_wallpaper_base.xml @@ -15,6 +15,10 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/live_wallpaper_base_view" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="match_parent"> + <fragment class="com.android.wallpaper.livepicker.LiveWallpaperListActivity$WallpaperDialog" + android:id="@+id/live_wallpaper_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</FrameLayout> |