Merge "AdvancedDisplay: Update to 4.4 settings style" into cm-11.0

AdvancedDisplay/AndroidManifest.xml

@@ -10,10 +10,11 @@
         <activity
             android:name="com.cyanogenmod.settings.device.DisplaySettings"
             android:launchMode="singleTop"
-            android:icon="@drawable/ic_launcher_cmdevicesettings"
+            android:icon="@mipmap/ic_launcher_settings"
             android:hardwareAccelerated="true"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
+            android:theme="@style/Theme.Main"
             android:excludeFromRecents="true" >
             <intent-filter>
                 <action android:name="com.cyanogenmod.action.LAUNCH_DEVICE_SETTINGS" />

AdvancedDisplay/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>