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

5 files changed, 23 insertions, 1 deletions

diff --git a/AdvancedDisplay/AndroidManifest.xml b/AdvancedDisplay/AndroidManifest.xml
index bd470fa..ed67c63 100644
--- a/AdvancedDisplay/AndroidManifest.xml
+++ b/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" />
diff --git a/AdvancedDisplay/res/drawable/ic_launcher_cmdevicesettings.png b/AdvancedDisplay/res/drawable/ic_launcher_cmdevicesettings.png
deleted file mode 100755
index 9bfdd78..0000000
--- a/AdvancedDisplay/res/drawable/ic_launcher_cmdevicesettings.png
+++ /dev/null
diff --git a/AdvancedDisplay/res/mipmap-hdpi/ic_launcher_settings.png b/AdvancedDisplay/res/mipmap-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..a8ccc89
--- /dev/null
+++ b/AdvancedDisplay/res/mipmap-hdpi/ic_launcher_settings.png
diff --git a/AdvancedDisplay/res/mipmap-xhdpi/ic_launcher_settings.png b/AdvancedDisplay/res/mipmap-xhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..c3adce6
--- /dev/null
+++ b/AdvancedDisplay/res/mipmap-xhdpi/ic_launcher_settings.png
diff --git a/AdvancedDisplay/res/values/themes.xml b/AdvancedDisplay/res/values/themes.xml
new file mode 100644
index 0000000..0df4907
--- /dev/null
+++ b/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>