commit 04df59eb082189500d360fffb95ef541073d6fe6
author Your Name <jreck@google.com> Mon Dec 03 16:14:03 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 03 16:14:03 2012 -0800
tree 5637a60ea2d20373e10e71aa959ddde74c6fc03a
parent 599393ecad6803161d5e901ef625e34cfe088009
parent d10468b65396dd1fa4f20006fa8cea1221cc613c

Merge "Change themes" into gb-ub-photos-arches

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0ef4fba..e6c6e2e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -394,7 +394,7 @@
             </intent-filter>
         </activity>
         <activity android:name="com.android.camera.ProxyLauncher"
-                android:theme="@android:style/Theme.NoDisplay">
+                android:theme="@style/Theme.ProxyLauncher">
         </activity>
     </application>
 </manifest>

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index e425827..8d3730d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -42,6 +42,8 @@
     </style>
     <style name="DialogPickerTheme" parent="Theme.Gallery">
     </style>
+    <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar">
+    </style>
     <bool name="picker_is_dialog">false</bool>
     <color name="darker_transparent">#C1000000</color>
     <style name="ActionBarTwoLinePrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"></style>