From 44f9a665effdc541efdf1d51ae644b428cd10ec6 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 23 Jan 2019 15:45:33 +0700
Subject: [PATCH] Fix ProgressDialog background

---
 .../tavultesoft/kmea/LanguageListActivity.java   |  7 ++++++-
 android/KMEA/app/src/main/res/values/styles.xml  | 16 ++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/LanguageListActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/LanguageListActivity.java
index 1130bfc9b8..5c6b69cc64 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/LanguageListActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/LanguageListActivity.java
@@ -30,6 +30,7 @@ import com.tavultesoft.kmea.util.MapCompat;
 
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
+import android.os.Build;
 import android.support.v7.app.AppCompatActivity;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -350,7 +351,11 @@ public final class LanguageListActivity extends AppCompatActivity implements OnK
       }
 
       if (hasConnection && !loadFromCache) {
-        progressDialog = new ProgressDialog(context, R.style.ProgressDialog);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+          progressDialog = new ProgressDialog(context, R.style.AppTheme_Dialog_Progress);
+        } else {
+          progressDialog = new ProgressDialog(context);
+        }
         progressDialog.setMessage(getString(R.string.getting_keyboard_catalog));
         progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.label_cancel),
           new DialogInterface.OnClickListener() {
diff --git a/android/KMEA/app/src/main/res/values/styles.xml b/android/KMEA/app/src/main/res/values/styles.xml
index b44ffde24b..0f99d6dab3 100644
--- a/android/KMEA/app/src/main/res/values/styles.xml
+++ b/android/KMEA/app/src/main/res/values/styles.xml
@@ -13,18 +13,14 @@
         -->
     </style>
 
-    <!--style name="ToolbarStyle">
-        <item name="theme">@style/ToolbarTheme</item>
+  <style name="AppTheme.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">
+      <item name="android:textColor">@android:color/black</item>
+      <item name="android:textColorHint">@android:color/darker_gray</item>
+      <item name="android:textColorPrimary">@android:color/black</item>
     </style>
 
-    <style name="ToolbarTheme">
-        <item name="android:background">@android:color/white</item>
-    </style-->
-
-    <style name="ProgressDialog">
-        <item name="android:textColor">@android:color/black</item>
-        <item name="android:textColorHint">@android:color/darker_gray</item>
-        <item name="android:textColorPrimary">@android:color/black</item>
+    <style name="AppTheme.Dialog.Progress" parent="AppTheme.Dialog.Alert">
+        <item name="android:windowBackground">@android:color/transparent</item>
     </style>
 
     <style name="PopupAnim">