summaryrefslogtreecommitdiffstats
path: root/res/values/styles.xml
diff options
context:
space:
mode:
authorYour Name <jreck@google.com>2012-12-03 16:15:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-03 16:15:37 -0800
commitf8eb7be9d9a165148401f38885a76e47c9b51641 (patch)
tree0a8120cbf04e7482f8748dcf1c4baf3203a48b8a /res/values/styles.xml
parent2f1d93aff1f8771f62f5f3bfaf00a160b3a654c9 (diff)
parent72fd6fa714eac41c40ddf125d3c0fba8f4477fdc (diff)
downloadandroid_packages_apps_Snap-f8eb7be9d9a165148401f38885a76e47c9b51641.tar.gz
android_packages_apps_Snap-f8eb7be9d9a165148401f38885a76e47c9b51641.tar.bz2
android_packages_apps_Snap-f8eb7be9d9a165148401f38885a76e47c9b51641.zip
am 04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '04df59eb082189500d360fffb95ef541073d6fe6': Change themes
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r--res/values/styles.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c42bd66f8..65eb3c0e1 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>