From 7d23bd5da5770645843f0dd11d89ea75db860de2 Mon Sep 17 00:00:00 2001 From: rsudev Date: Fri, 29 Mar 2013 14:01:19 +0100 Subject: Fixes #2589, Light skin not working Re-added background attribute to select view definitions where 2.x doesn't correctly apply the theme background. Additionally disabled light theme for dialogs on 2.x, as it doesn't work there --- main/res/layout-land/navigate.xml | 1 + main/res/layout/about_activity.xml | 1 + main/res/layout/cacheview.xml | 1 + main/res/layout/edit_waypoint_activity.xml | 1 + main/res/layout/init.xml | 1 + main/res/layout/navigate.xml | 1 + main/res/layout/point.xml | 1 + main/res/layout/search.xml | 1 + main/res/layout/simple_dir_chooser.xml | 1 + main/res/layout/touch.xml | 1 + main/res/layout/trackable_activity.xml | 1 + main/res/layout/useful_apps.xml | 1 + main/res/layout/visit.xml | 1 + main/res/layout/visit_image.xml | 1 + main/src/cgeo/geocaching/activity/ActivityMixin.java | 4 +++- 15 files changed, 17 insertions(+), 1 deletion(-) diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml index 5897f65..aa8b2b4 100644 --- a/main/res/layout-land/navigate.xml +++ b/main/res/layout-land/navigate.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml index a872501..9325ea0 100644 --- a/main/res/layout/about_activity.xml +++ b/main/res/layout/about_activity.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml index 3dcf9d8..89d7152 100644 --- a/main/res/layout/cacheview.xml +++ b/main/res/layout/cacheview.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:background="?background_color" android:orientation="vertical" > diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml index 92a8c75..3fbd19e 100644 --- a/main/res/layout/edit_waypoint_activity.xml +++ b/main/res/layout/edit_waypoint_activity.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml index a1fd3ae..26137fc 100644 --- a/main/res/layout/init.xml +++ b/main/res/layout/init.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml index 2819f21..0c95958 100644 --- a/main/res/layout/navigate.xml +++ b/main/res/layout/navigate.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml index ec34f85..3c133d8 100644 --- a/main/res/layout/point.xml +++ b/main/res/layout/point.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml index c3097db..6d0bf91 100644 --- a/main/res/layout/search.xml +++ b/main/res/layout/search.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:background="?background_color" android:orientation="vertical" > diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml index d7d2322..7c9d95a 100644 --- a/main/res/layout/simple_dir_chooser.xml +++ b/main/res/layout/simple_dir_chooser.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml index edc69e6..fe61409 100644 --- a/main/res/layout/trackable_activity.xml +++ b/main/res/layout/trackable_activity.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:background="?background_color" android:orientation="vertical" > diff --git a/main/res/layout/useful_apps.xml b/main/res/layout/useful_apps.xml index a3d4f87..2a3d14e 100644 --- a/main/res/layout/useful_apps.xml +++ b/main/res/layout/useful_apps.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml index 70603c5..43a3308 100644 --- a/main/res/layout/visit.xml +++ b/main/res/layout/visit.xml @@ -2,6 +2,7 @@ diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml index b4e7a0f..7997406 100644 --- a/main/res/layout/visit_image.xml +++ b/main/res/layout/visit_image.xml @@ -2,6 +2,7 @@ diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java index de2dade..c97cb9a 100644 --- a/main/src/cgeo/geocaching/activity/ActivityMixin.java +++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java @@ -13,6 +13,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.drawable.Drawable; +import android.os.Build; import android.view.Gravity; import android.view.View; import android.view.WindowManager; @@ -88,7 +89,8 @@ public final class ActivityMixin { } public static int getDialogTheme() { - if (Settings.isLightSkin()) { + // Light theme dialogs don't work on Android Api < 11 + if (Settings.isLightSkin() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { return R.style.popup_light; } -- cgit v1.1