summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-07-04 13:49:22 +0300
committerDanny Baumann <dannybaumann@web.de>2014-07-05 21:22:37 +0200
commitb0c8ca89d1c03fa3ba0daeea701b8960d5b2d5be (patch)
tree00801691e29ca65eaa8c38661f2066e28aa660c3
parent0178779dbd3703f40cadd43d5569135022155949 (diff)
downloadandroid_packages_apps_CellBroadcastReceiver-b0c8ca89d1c03fa3ba0daeea701b8960d5b2d5be.tar.gz
android_packages_apps_CellBroadcastReceiver-b0c8ca89d1c03fa3ba0daeea701b8960d5b2d5be.tar.bz2
android_packages_apps_CellBroadcastReceiver-b0c8ca89d1c03fa3ba0daeea701b8960d5b2d5be.zip
CellBroadcastReceiver: Update ActionBar to match Settings
Even though CellBroadcastReceiver is a seperate app, it is accessed directly in the Settings app and has an action bar style different to all the screens in the Settings app. Change-Id: I8e8b8bd0fa7094b159d68bd1a4ec269821480764
-rw-r--r--AndroidManifest.xml3
-rw-r--r--res/values/themes.xml21
2 files changed, 23 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e1211655..6eba9fd9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -74,7 +74,8 @@
android:label="@string/sms_cb_settings"
android:launchMode="singleTask"
android:exported="true"
- android:configChanges="orientation|screenSize" />
+ android:configChanges="orientation|screenSize"
+ android:theme="@style/Theme.Main" />
<activity android:name="CellBroadcastAlertDialog"
android:theme="@android:style/Theme.Holo.Dialog"
diff --git a/res/values/themes.xml b/res/values/themes.xml
new file mode 100644
index 00000000..0df49073
--- /dev/null
+++ b/res/values/themes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The CyanogenMod 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>
+ <style name="Theme.Main" parent="@android:style/Theme.Holo">
+ <item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>
+ </style>
+</resources>