diff options
| author | Your Name <jreck@google.com> | 2012-12-03 16:15:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-03 16:15:33 -0800 |
| commit | 17290ae6fd9d3622f4c33ff63788cd31b20acb93 (patch) | |
| tree | c28d7980854e4240cfa89dcd0d10548d67d40d27 | |
| parent | cad5c1afc1dc467f67f0b0b764785b6ae17b5e23 (diff) | |
| parent | 04df59eb082189500d360fffb95ef541073d6fe6 (diff) | |
| download | android_packages_apps_Gallery2-17290ae6fd9d3622f4c33ff63788cd31b20acb93.tar.gz android_packages_apps_Gallery2-17290ae6fd9d3622f4c33ff63788cd31b20acb93.tar.bz2 android_packages_apps_Gallery2-17290ae6fd9d3622f4c33ff63788cd31b20acb93.zip | |
am 04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '04df59eb082189500d360fffb95ef541073d6fe6':
Change themes
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4447ec4ee..b6f86132e 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> diff --git a/res/values/styles.xml b/res/values/styles.xml index e425827b8..8d3730d92 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> |