summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-08-13 23:21:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-13 23:21:49 +0000
commit0abbdb370b4cd722a739cf65c7b5845ceef535b8 (patch)
tree50b135137e3e39c4bbb4f5a847e890cd69e7bb32
parent02ed1b27b8cd2d0493ed18aea1ce304b6837ef64 (diff)
parent50df47071c776703a36dbc4cb90ec8d1df3c0f6e (diff)
downloadandroid_packages_apps_Snap-0abbdb370b4cd722a739cf65c7b5845ceef535b8.tar.gz
android_packages_apps_Snap-0abbdb370b4cd722a739cf65c7b5845ceef535b8.tar.bz2
android_packages_apps_Snap-0abbdb370b4cd722a739cf65c7b5845ceef535b8.zip
Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad
-rw-r--r--res/values/styles.xml2
-rw-r--r--src/com/android/camera/CameraActivity.java1
2 files changed, 3 insertions, 0 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dede2391b..f374db41e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -55,6 +55,8 @@
</style>
<style name="Theme.Camera" parent="Theme.CameraBase">
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowTitleSize">0dp</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="android:colorBackgroundCacheHint">@android:color/black</item>
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 66667e12d..3e2065c28 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -452,6 +452,7 @@ public class CameraActivity extends Activity
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
+ getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
setContentView(R.layout.camera_filmstrip);
mActionBar = getActionBar();
// Hide action bar first since we are in full screen mode first.