summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-08-09 17:37:15 -0700
committerztenghui <ztenghui@google.com>2013-08-09 17:59:14 -0700
commitfa9e2cc9ccbcd746f5765cb7a0afebcdb60e2973 (patch)
tree077f8128170ad12f510852775721e3a7f39d0b2f /res
parent70466a0f15b91efdfdfd97a718e3d4089666a51c (diff)
downloadandroid_packages_apps_Snap-fa9e2cc9ccbcd746f5765cb7a0afebcdb60e2973.tar.gz
android_packages_apps_Snap-fa9e2cc9ccbcd746f5765cb7a0afebcdb60e2973.tar.bz2
android_packages_apps_Snap-fa9e2cc9ccbcd746f5765cb7a0afebcdb60e2973.zip
Add the basic action bar back.
Remove outdated styles. bug:10245009 Change-Id: I1ab6e6ea7c3e5c4157951203209b573dd2edda88
Diffstat (limited to 'res')
-rw-r--r--res/values-v11/styles.xml24
-rw-r--r--res/values-v13/styles.xml20
-rw-r--r--res/values/styles.xml2
3 files changed, 1 insertions, 45 deletions
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
deleted file mode 100644
index d4105a34f..000000000
--- a/res/values-v11/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- When an activity requests a theme with an action bar from its manifest,
- the activity preview window created by the system process while the
- real activity is loading will also contain an action bar. Set this to
- NoActionBar and change the theme in onCreate. -->
- <style name="Theme.CameraBase" parent="android:Theme.Holo.NoActionBar.Fullscreen"/>
- <style name="Widget.Button.Borderless" parent="android:Widget.Holo.Button.Borderless"/>
-</resources>
-
diff --git a/res/values-v13/styles.xml b/res/values-v13/styles.xml
deleted file mode 100644
index 10162b09e..000000000
--- a/res/values-v13/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="TextAppearance.DialogWindowTitle" parent="@android:style/TextAppearance.Holo.DialogWindowTitle"/>
- <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Holo.Medium"/>
-</resources>
-
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8af034474..dede2391b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -59,7 +59,7 @@
<item name="android:colorBackground">@android:color/black</item>
<item name="android:colorBackgroundCacheHint">@android:color/black</item>
</style>
- <style name="Theme.CameraBase" parent="android:Theme.Black.NoTitleBar.Fullscreen"/>
+ <style name="Theme.CameraBase" parent="android:Theme.Holo"/>
<style name="OnScreenHintTextAppearance">
<item name="android:textColor">@android:color/primary_text_dark</item>
<item name="android:textColorHighlight">#FFFF9200</item>