From a31c2571866b46f568a58df5318c13d4a0b22d9b Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Fri, 23 Sep 2011 13:02:48 +0800
Subject: Fix 5349519: The Select photo/video activity should use action bar.

Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
---
 res/layout/dialog_picker.xml | 3 ++-
 res/values-xlarge/styles.xml | 3 +++
 res/values/styles.xml        | 5 ++---
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/layout/dialog_picker.xml b/res/layout/dialog_picker.xml
index 6dfa9d90d..ba3f500f1 100644
--- a/res/layout/dialog_picker.xml
+++ b/res/layout/dialog_picker.xml
@@ -34,5 +34,6 @@
             android:layout_weight="0"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@android:string/cancel" />
+            android:text="@android:string/cancel"
+            android:visibility="gone" />
 </LinearLayout>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 12f415306..b71e0394b 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -21,4 +21,7 @@
         <item name="android:colorBackground">@null</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
     </style>
+    <style name="DialogPickerTheme" parent="android:Theme.Holo.Dialog">
+    </style>
+    <bool name="picker_is_dialog">true</bool>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c9beab5da..df9fea382 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,8 +32,7 @@
         <item name="android:background">@null</item>
         <item name="android:src">@drawable/icn_media_play</item>
     </style>
-    <style name="DialogPickerTheme" parent="android:Theme.Holo.Dialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowIsFloating">false</item>
+    <style name="DialogPickerTheme" parent="Theme.Gallery">
     </style>
+    <bool name="picker_is_dialog">false</bool>
 </resources>
-- 
cgit v1.2.3