Merge change 1060 into donut

* changes:
  Reduce GalleryPicker start up time.

2 files changed, 56 insertions, 40 deletions

diff --git a/res/layout/gallerypicker.xml b/res/layout/gallerypicker.xml
index 8d8dc69..a2e7e55 100644
--- a/res/layout/gallerypicker.xml
+++ b/res/layout/gallerypicker.xml
@@ -18,45 +18,16 @@
     android:id="@+id/root"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-	<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@+id/albums"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:paddingTop="2dip"
-		android:numColumns="auto_fit"
-		android:columnWidth="148dp"
-		android:stretchMode="spacingWidthUniform"
-		android:drawSelectorOnTop="false"
-		android:cacheColorHint="#000000"
-		android:background="#000000"/>
-
-    <RelativeLayout android:id="@+id/no_images"
-    	android:visibility="gone"
-        android:orientation="vertical"
-        android:layout_centerInParent="true"
+    <GridView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/albums"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-
-	    <ImageView
-	    	android:id="@+id/no_pictures_image"
-			android:layout_centerInParent="true"
-            android:layout_gravity="center"
-	    	android:background="@drawable/ic_gallery_empty2"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	    />
-
-	    <TextView
-	    	android:layout_below="@id/no_pictures_image"
-	    	android:layout_centerHorizontal="true"
- 			android:paddingTop="5dip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-        	android:text="@string/image_gallery_NoImageView_text"
-        	android:textColor="#FFBEBEBE"
-        	android:textSize="18dip"
-    	/>
-    </RelativeLayout>
-
+        android:layout_height="fill_parent"
+        android:paddingTop="2dip"
+        android:numColumns="auto_fit"
+        android:columnWidth="148dp"
+        android:stretchMode="spacingWidthUniform"
+        android:drawSelectorOnTop="false"
+        android:cacheColorHint="#000000"
+        android:background="#000000"
+        android:listSelector="#000000"/>
 </RelativeLayout>
diff --git a/res/layout/gallerypicker_no_images.xml b/res/layout/gallerypicker_no_images.xml
new file mode 100644
index 0000000..ca926cf
--- /dev/null
+++ b/res/layout/gallerypicker_no_images.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/no_images"
+        android:visibility="gone"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+        <ImageView
+            android:id="@+id/no_pictures_image"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:background="@drawable/ic_gallery_empty2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+        />
+
+        <TextView
+            android:layout_below="@id/no_pictures_image"
+            android:layout_centerHorizontal="true"
+            android:paddingTop="5dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/image_gallery_NoImageView_text"
+            android:textColor="#FFBEBEBE"
+            android:textSize="18dip"
+        />
+</RelativeLayout>