summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-09-23 13:02:48 +0800
committerChih-Chung Chang <chihchung@google.com>2011-09-23 14:13:02 +0800
commita31c2571866b46f568a58df5318c13d4a0b22d9b (patch)
tree5ec9f1275bae454448ca281b105a48850f0d78aa
parentbb6f096c1c53e1924c67e3f25369e5aa98ec55df (diff)
downloadandroid_packages_apps_Snap-a31c2571866b46f568a58df5318c13d4a0b22d9b.zip
android_packages_apps_Snap-a31c2571866b46f568a58df5318c13d4a0b22d9b.tar.gz
android_packages_apps_Snap-a31c2571866b46f568a58df5318c13d4a0b22d9b.tar.bz2
Fix 5349519: The Select photo/video activity should use action bar.
Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
-rw-r--r--res/layout/dialog_picker.xml3
-rw-r--r--res/values-xlarge/styles.xml3
-rw-r--r--res/values/styles.xml5
3 files changed, 7 insertions, 4 deletions
diff --git a/res/layout/dialog_picker.xml b/res/layout/dialog_picker.xml
index 6dfa9d9..ba3f500 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 12f4153..b71e039 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 c9beab5..df9fea3 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>