Updating the LiveWallpaperPicker UI

> Using the settings theme
> Removing GirdLayout usage, using ListView with appropriate padding
> Removing trampoline activity when starting wallpaper preview

Change-Id: Iea12a8c1c6d6cdc0682add07e1b9565827da71c8

3 files changed, 16 insertions, 52 deletions

diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml
index bb4c960..dfbd212 100644
--- a/res/layout/live_wallpaper_base.xml
+++ b/res/layout/live_wallpaper_base.xml
@@ -16,9 +16,21 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <fragment class="com.android.wallpaper.livepicker.LiveWallpaperActivity$WallpaperDialog"
-        android:id="@+id/live_wallpaper_fragment"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/screen_margin_sides"
+    android:paddingRight="@dimen/screen_margin_sides">
+    <ListView
+        android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:drawSelectorOnTop="false" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:visibility="gone"
+        android:text="@string/live_wallpaper_empty"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 </FrameLayout>
diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml
index df75e84..a133841 100644
--- a/res/layout/live_wallpaper_entry.xml
+++ b/res/layout/live_wallpaper_entry.xml
@@ -17,43 +17,33 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-
     android:paddingStart="6dip"
     android:paddingEnd="6dip"
     android:paddingTop="6dip"
     android:paddingBottom="6dip"
-
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
         android:id="@+id/thumbnail"
-
         android:layout_width="@dimen/live_wallpaper_thumbnail_width"
         android:layout_height="@dimen/live_wallpaper_thumbnail_height"
-
         android:layout_gravity="center_vertical"
-
         android:scaleType="centerCrop" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-
         android:layout_marginStart="10dip"
         android:layout_marginEnd="8dip"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/thumbnail"
-
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/title"
-
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
             android:textAppearance="?android:attr/textAppearanceMedium"
-
             android:singleLine="true"
             android:ellipsize="marquee" />
 
diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml
deleted file mode 100644
index a3c22bb..0000000
--- a/res/layout/live_wallpaper_list.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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">
-    <ListView 
-        android:id="@android:id/list"
-    
-        android:layout_width="match_parent" 
-        android:layout_height="match_parent"
-    
-        android:drawSelectorOnTop="false" />
-    
-    <TextView
-        android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-
-        android:gravity="center"
-        android:visibility="gone"
-
-        android:text="@string/live_wallpaper_empty"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-</FrameLayout>
\ No newline at end of file