[Android] UI : Simplify styles

Alexandre Perraud git at videolan.org
Fri Mar 20 16:39:36 CET 2015


vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Fri Mar 20 16:38:55 2015 +0100| [cda57648ed292f321c690b9da7deea87b6281e91] | committer: Alexandre Perraud

UI : Simplify styles

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

 vlc-android/res/values-v17/styles.xml |   18 ------------------
 vlc-android/res/values-v21/styles.xml |    5 ++---
 vlc-android/res/values/styles.xml     |    6 ++++--
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/vlc-android/res/values-v17/styles.xml b/vlc-android/res/values-v17/styles.xml
deleted file mode 100644
index 89d63d0..0000000
--- a/vlc-android/res/values-v17/styles.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="Theme.VLC" parent="Theme.VLC.17"/>
-    <style name="Theme.VLC.Black" parent="Theme.VLC.Black.17"/>
-
-    <style name="Theme.VLC.17" parent="Theme.VLC.Apearance">
-        <item name="actionBarStyle">@style/ActionBar</item>
-        <item name="actionBarSize">50dp</item>
-        <item name="windowActionBarOverlay">true</item>
-        <item name="drawerArrowStyle">@style/ActionBar.ArrowToggle</item>
-    </style>
-    <style name="Theme.VLC.Black.17" parent="Theme.VLC.Apearance.Black">
-        <item name="actionBarStyle">@style/ActionBar</item>
-        <item name="actionBarSize">50dp</item>
-        <item name="windowActionBarOverlay">true</item>
-        <item name="drawerArrowStyle">@style/ActionBar.ArrowToggle</item>
-    </style>
-</resources>
diff --git a/vlc-android/res/values-v21/styles.xml b/vlc-android/res/values-v21/styles.xml
index 2f5295e..32213e1 100644
--- a/vlc-android/res/values-v21/styles.xml
+++ b/vlc-android/res/values-v21/styles.xml
@@ -5,13 +5,12 @@
     <style name="Theme.VLC.Black" parent="Theme.VLC.Black.21"/>
     <style name="Theme.VLC.Player" parent="Theme.VLC.Player.21"/>
 
-    <style name="Theme.VLC.21" parent="Theme.VLC.17">
+    <style name="Theme.VLC.21" parent="Theme.VLC.7">
         <item name="android:colorPrimary">@color/orange800</item>
-
         <item name="android:statusBarColor">@color/orange700</item>
         <item name="android:popupMenuStyle">@style/PopupMenuStyle.Light</item>
     </style>
-    <style name="Theme.VLC.Black.21" parent="Theme.VLC.Black.17">
+    <style name="Theme.VLC.Black.21" parent="Theme.VLC.Black.7">
         <item name="android:colorPrimary">@color/orange800</item>
         <item name="android:statusBarColor">@color/grey900</item>
         <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index 4d927e4..09c767b 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Theme.VLC" parent="Theme.VLC.Apearance">
+    <style name="Theme.VLC" parent="Theme.VLC.7"/>
+    <style name="Theme.VLC.7" parent="Theme.VLC.Apearance">
         <item name="actionBarStyle">@style/ActionBar</item>
         <item name="actionBarSize">50dp</item>
         <item name="windowActionBarOverlay">true</item>
@@ -71,7 +72,8 @@
         <item name="advanced_options_style">@style/Theme.VLC.AdvancedOptionsLight</item>
     </style>
 
-    <style name="Theme.VLC.Black" parent="Theme.VLC.Apearance.Black">
+    <style name="Theme.VLC.Black" parent="Theme.VLC.Black.7"/>
+    <style name="Theme.VLC.Black.7" parent="Theme.VLC.Apearance.Black">
         <item name="actionBarStyle">@style/ActionBar</item>
         <item name="actionBarSize">50dp</item>
         <item name="windowActionBarOverlay">true</item>



More information about the Android mailing list