[Android] Styles: use values-v14 for native style attributes of the action bar.

[Adrien Maglo]

vlc-ports/android | branch: master | Adrien Maglo <magsoft at videolan.org> | Mon Mar 31 22:07:49 2014 +0200| [e13bc53fb526477ac8bf4e9edb699b86ac69d692] | committer: Adrien Maglo

Styles: use values-v14 for native style attributes of the action bar.

This should fix crashes on XPeria 2.3 devices that may be caused by attribute id collisions.

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=e13bc53fb526477ac8bf4e9edb699b86ac69d692
---

 vlc-android/res/values-v14/styles.xml |   23 +++++++++++++++++++++++
 vlc-android/res/values/styles.xml     |   22 ++++++++++------------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/vlc-android/res/values-v14/styles.xml b/vlc-android/res/values-v14/styles.xml
new file mode 100644
index 0000000..7fbd4b6
--- /dev/null
+++ b/vlc-android/res/values-v14/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.VLC" parent="Theme.VLC.Apearance">
+        <item name="android:actionBarStyle">@style/ActionBar</item>
+        <item name="android:actionBarSize">50dp</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:actionOverflowButtonStyle">@style/ActionBar.OverflowButton</item>
+    </style>
+
+    <style name="Theme.VLC.Black" parent="Theme.VLC.Apearance.Black">
+        <item name="android:actionBarStyle">@style/ActionBar</item>
+        <item name="android:actionBarSize">50dp</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:actionOverflowButtonStyle">@style/ActionBar.OverflowButton</item>
+    </style>
+
+    <style name="ActionBar" parent="Widget.Sherlock.Light.ActionBar">
+        <item name="android:background">@drawable/actionbar_background</item>
+        <item name="android:titleTextStyle">@style/ActionBar.Text</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index fbe537e..2e29f81 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -8,16 +8,16 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="Theme.VLC" parent="Theme.Sherlock.Light">
+    <style name="Theme.VLC" parent="Theme.VLC.Apearance">
         <item name="actionBarStyle">@style/ActionBar</item>
-        <item name="android:actionBarStyle">@style/ActionBar</item>
         <item name="actionBarSize">50dp</item>
-        <item name="android:actionBarSize">50dp</item>
-        <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
-        <item name="android:actionOverflowButtonStyle">@style/ActionBar.OverflowButton</item>
         <item name="actionOverflowButtonStyle">@style/ActionBar.OverflowButton</item>
+    </style>
+
+    <style name="Theme.VLC.Apearance" parent="Theme.Sherlock.Light">
         <item name="marginTopContent">50dp</item>
+
         <item name="android:listViewStyle">@style/Theme.VLC.List</item>
         <item name="android:gridViewStyle">@style/Theme.VLC.List</item>
         <item name="android:expandableListViewStyle">@style/Theme.VLC.List</item>
@@ -68,16 +68,16 @@
         <item name="advanced_options_style">@style/Theme.VLC.AdvancedOptionsLight</item>
     </style>
 
-    <style name="Theme.VLC.Black" parent="Theme.Sherlock">
+    <style name="Theme.VLC.Black" parent="Theme.VLC.Apearance.Black">
         <item name="actionBarStyle">@style/ActionBar</item>
-        <item name="android:actionBarStyle">@style/ActionBar</item>
         <item name="actionBarSize">50dp</item>
-        <item name="android:actionBarSize">50dp</item>
-        <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
-        <item name="android:actionOverflowButtonStyle">@style/ActionBar.OverflowButton</item>
         <item name="actionOverflowButtonStyle">@style/ActionBar.OverflowButton</item>
+    </style>
+
+    <style name="Theme.VLC.Apearance.Black" parent="Theme.Sherlock">
         <item name="marginTopContent">50dp</item>
+
         <item name="android:listViewStyle">@style/Theme.VLC.List</item>
         <item name="android:gridViewStyle">@style/Theme.VLC.List</item>
         <item name="android:expandableListViewStyle">@style/Theme.VLC.List</item>
@@ -152,9 +152,7 @@
     </style>
 
     <style name="ActionBar" parent="Widget.Sherlock.Light.ActionBar">
-        <item name="android:background">@drawable/actionbar_background</item>
         <item name="background">@drawable/actionbar_background</item>
-        <item name="android:titleTextStyle">@style/ActionBar.Text</item>
         <item name="titleTextStyle">@style/ActionBar.Text</item>
     </style>