summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-08-20 23:50:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-20 23:50:09 +0000
commit2b18ecece9ad0affe9054b2818722bf727fcde97 (patch)
tree02c18761bf8f02fd9213f33e2ae00a1476cec577
parent5ad4114f1ad766fa0ec9a9e6469313dd000f426d (diff)
parent23ac39ce4c6b7b5934d9f6604c8348dfb94bc243 (diff)
downloadandroid_packages_apps_Snap-2b18ecece9ad0affe9054b2818722bf727fcde97.tar.gz
android_packages_apps_Snap-2b18ecece9ad0affe9054b2818722bf727fcde97.tar.bz2
android_packages_apps_Snap-2b18ecece9ad0affe9054b2818722bf727fcde97.zip
Merge "Make camera preview full screen" into gb-ub-photos-carlsbad
-rw-r--r--res/values/styles.xml36
1 files changed, 1 insertions, 35 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 50892329b..2fd7dbd24 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,46 +15,12 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-<!-- <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"/>
- <style name="Theme.Gallery" parent="Theme.GalleryBase">
- <item name="android:displayOptions"></item>
- <item name="android:windowContentOverlay">@null</item>
- <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
- <item name="android:windowBackground">@android:color/black</item>
- <item name="android:colorBackground">@null</item>
- <item name="android:colorBackgroundCacheHint">@null</item>
- </style>
- <style name="Theme.FilterShow" parent="Theme.Gallery">
- <item name="android:windowBackground">@color/background_screen</item>
- </style>
- <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar">
- <item name="android:displayOptions">useLogo|showHome</item>
- <item name="android:background">@drawable/actionbar_translucent</item>
- <item name="android:backgroundStacked">@null</item>
- </style>
- <style name="MediaButton.Play" parent="@android:style/MediaButton.Play">
- <item name="android:background">@null</item>
- <item name="android:src">@drawable/icn_media_play</item>
- </style>
- <style name="DialogPickerTheme" parent="Theme.Gallery">
- </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>
- <style name="ActionBarTwoLineSecondary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"></style>
- <style name="ActionBarTwoLineItem">
- <item name="android:background">@drawable/action_bar_two_line_background</item>
- </style> -->
-
<!-- Camera resources below -->
<style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar">
</style>
<style name="Theme.Camera" parent="Theme.CameraBase">
+ <item name="android:windowFullscreen">true</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowTitleSize">0dp</item>
<item name="android:windowActionBarOverlay">true</item>