[Libreoffice-commits] core.git: 2 commits - android/sdremote

[Michael Meeks]

 android/sdremote/res/values/styles.xml |   56 +++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

New commits:
commit 31eeb79521b952212e3018f262e25e6b3f4599e7
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Feb 13 14:12:00 2013 +0000

    Revert "resolve fdo#60379 Impress Remote: Options look disabled"
    
    This reverts commit 23e6ac150b217be70a80d42deb5b253059030783.

diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml
index c88c947..80a4b4a 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -72,9 +72,9 @@
         <item name="android:actionDropDownStyle">@style/Theme.ImpressRemote.ActionBarMenu</item>
         <item name="android:windowBackground">@color/light_grey</item>
         <item name="android:homeAsUpIndicator">@drawable/up_indicator_white</item>
-        <item name="android:textColor">@color/light_grey</item>
+        <item name="android:textColor">@color/text_grey</item>
         <item name="android:alertDialogStyle">@style/Theme.ImpressRemote.Dialog</item>
 
     </style>
 
-</resources>
+</resources>
\ No newline at end of file
commit c922df9814c85c080272fc4962584133fa6f5316
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Feb 13 14:09:02 2013 +0000

    Revert "Just use default colours until proven they don't work;)"
    
    Colors should be orange by design.
    
    This reverts commit ab0bbe53ae02361d521c133dd5c0b6db3423b0cb.

diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml
index 683114f..c88c947 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -14,15 +14,67 @@
     <color name="thumbnail_border">#B4B4B4</color>
     <color name="thumbnail_border_selected">#EE4400</color>
 
+    <style name="Theme.ImpressRemote.ActionBar.Title" parent="android:style/Widget.Holo.Light.ActionBar">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">18dp</item>
+    </style>
+
+    <style name="Theme.ImpressRemote.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
+        <item name="android:background">@color/orange</item>
+        <item name="background">@color/orange</item>
+        <item name="android:titleTextStyle">@style/Theme.ImpressRemote.ActionBar.Title</item>
+        <item name="titleTextStyle">@style/Theme.ImpressRemote.ActionBar.Title</item>
+        <item name="backgroundSplit">@color/text_grey</item>
+        <item name="android:backgroundSplit">@color/text_grey</item>
+    </style>
+
+    <style name="Theme.ImpressRemote.ActionBarWidget" parent="android:style/Widget.Holo.Light">
+        <item name="android:background">@color/orange</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">22dp</item>
+    </style>
+
+    <style name="Theme.ImpressRemote.ActionBarMenu" parent="android:style/Widget.Holo.Light.ListPopupWindow">
+        <item name="android:background">@color/grey</item>
+        <!-- <item name="android:popupBackground">@color/black</item> -->
+    </style>
+
     <style name="Theme.ImpressRemote.ActionBarMenuItem" parent="Widget.Sherlock.Light.Spinner.DropDown.ActionBar">
+        <item name="android:background">@color/grey</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:textSize">16dp</item>
     </style>
 
+    <style name="Theme.ImpressRemote.Dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@color/light_grey</item>
+        <item name="android:fullDark">@color/light_grey</item>
+        <item name="android:topDark">@color/light_grey</item>
+        <item name="android:centerDark">@color/light_grey</item>
+        <item name="android:bottomDark">@color/light_grey</item>
+        <item name="android:fullBright">@color/light_grey</item>
+        <item name="android:centerBright">@color/light_grey</item>
+        <item name="android:bottomBright">@color/light_grey</item>
+        <item name="android:bottomMedium">@color/light_grey</item>
+        <item name="android:centerMedium">@color/light_grey</item>
+        <item name="android:textColor">@color/grey</item>
+    </style>
+
+    <style name="Theme.ImpressRemote.Dialog.Title" parent="@android:style/Theme.Dialog">
+        <item name="android:textColor">@color/grey</item>
+    </style>
+
     <style name="Theme.ImpressRemote" parent="Theme.Sherlock.Light.DarkActionBar">
+        <item name="android:actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
+        <item name="actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
+        <item name="android:popupMenuStyle">@style/Theme.ImpressRemote.ActionBarMenu</item>
         <item name="android:dropDownListViewStyle">@style/Theme.ImpressRemote.ActionBarMenuItem</item>
-        <item name="android:textAppearanceLargePopupMenu">@style/Theme.ImpressRemote.ActionBarMenuItem</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/Theme.ImpressRemote.ActionBarMenuItem</item> <!-- <item name="android:actionBarWidgetTheme">@style/Theme.ImpressRemote.ActionBarWidget</item> -->
+        <item name="android:actionDropDownStyle">@style/Theme.ImpressRemote.ActionBarMenu</item>
+        <item name="android:windowBackground">@color/light_grey</item>
         <item name="android:homeAsUpIndicator">@drawable/up_indicator_white</item>
+        <item name="android:textColor">@color/light_grey</item>
         <item name="android:alertDialogStyle">@style/Theme.ImpressRemote.Dialog</item>
+
     </style>
 
 </resources>