Merge "Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread." into gb-ub-photos-arches

3 files changed, 27 insertions, 3 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2ad38c4ce..2ef8086c2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -235,7 +235,7 @@
         </activity>
 
         <activity android:name="com.android.gallery3d.settings.GallerySettings"
-                android:theme="@android:style/Theme.Holo"
+                android:theme="@style/Theme.Gallery"
                 android:configChanges="orientation|keyboardHidden|screenSize" />
 
         <provider android:name="com.android.gallery3d.provider.GalleryProvider"
@@ -252,7 +252,7 @@
                 android:theme="@style/DialogPickerTheme"/>
         <activity android:name="com.android.gallery3d.gadget.WidgetTypeChooser"
                 android:configChanges="keyboardHidden|orientation|screenSize"
-                android:theme="@android:style/Theme.Holo.Dialog"/>
+                android:theme="@style/Theme.Gallery.Dialog"/>
 
         <activity android:name="com.android.camera.Camera"
                 android:taskAffinity="com.android.camera"
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100644
index 000000000..56c036317
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<resources>
+    <style name="Theme.GalleryBase" parent="android:Theme.Holo">
+        <item name="listPreferredItemHeightSmall">48dp</item>
+        <item name="switchStyle">@android:style/Widget.CompoundButton</item>
+    </style>
+    <style name="Theme.Gallery.Dialog" parent="android:Theme.Holo.Dialog"/>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3239f681d..9bbee9191 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,10 +15,11 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <style name="Theme.GalleryBase" parent="android:Theme.Holo">
+    <style name="Theme.GalleryBase" parent="android:Theme.Black">
         <item name="listPreferredItemHeightSmall">48dp</item>
         <item name="switchStyle">@android:style/Widget.CompoundButton</item>
     </style>
+    <style name="Theme.Gallery.Dialog" parent="android:Theme.Dialog"/>
     <style name="Theme.Gallery" parent="Theme.GalleryBase">
         <item name="android:displayOptions"></item>
         <item name="android:windowContentOverlay">@null</item>