Skip to content

GitLab

Commit 03b1ff60 authored by Your Name's avatar Your Name Committed by Android Git Automerger
Browse files

am 04df59eb: Merge "Change themes" into gb-ub-photos-arches 

* commit '04df59eb':
  Change themes
parents 300c2d4a 04df59eb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
AndroidManifest.xml
View file @ 03b1ff60
......@@ -398,7 +398,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
View file @ 03b1ff60
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment