[Libreoffice-commits] core.git: android/experimental

[Miklos Vajna]

 android/experimental/LOAndroid3/AndroidManifest.xml.in                   |    3 +--
 android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml |    1 +
 android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml   |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7bb1c7397076d9085c62f828cc8868777cd29a94
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 17 11:45:13 2014 +0100

    android: fix unreadable text in doc browser's about dialog
    
    There were two inconsistencies here:
    
    - The doc browser activity had an explicit android:theme, but the viewer
      does not, so remove it to be consistent, this fixes the about dialog's
      "black text on black background" problem.
    - Now the doc browser had white text on white background: the about
      dialog explicitly uses android:textColor for the strings which should
      be readable on a bright background, do the same in
      file_explorer_folder_icon and file_explorer_grid_item, that makes doc
      browser text readable as well.
    
    Change-Id: Iae9103556ca7c32c9ac8ea02d9e5d5fa6dfb72b5

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index c3a6b31..0c659d8 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -82,8 +82,7 @@
         </activity>
         <!-- Document Browser Activity -->
         <activity android:name=".ui.LibreOfficeUIActivity"
-                  android:label="@string/app_name"
-                  android:theme="@android:style/Theme.Holo">
+                  android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
index 60dd9b9..4271ac4 100644
--- a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
+++ b/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
@@ -29,6 +29,7 @@
         android:layout_gravity="center"
         android:textSize="15dp"
         android:textStyle="bold"
+        android:textColor="@android:color/secondary_text_light"
         android:maxLines="2">
     </TextView>
 
diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
index e4569e0..6e269c8 100644
--- a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
+++ b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
@@ -30,6 +30,7 @@
         android:layout_gravity="center"
         android:textSize="15dp"
         android:textStyle="bold"
+        android:textColor="@android:color/secondary_text_light"
         android:maxLines="2">
     </TextView>