From 4b699d53769fac7c445ab2f53c222f6b859d2eef Mon Sep 17 00:00:00 2001 From: relan Date: Mon, 20 Jul 2015 11:17:40 +0300 Subject: [PATCH] Use AlertDialog from the support library This unifies look of alert dialogs across various Android versions and allows proper tinting. --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 2 +- F-Droid/src/org/fdroid/fdroid/FDroid.java | 25 +++---------------- .../installer/AppSecurityPermissions.java | 2 +- .../InstallIntoSystemDialogActivity.java | 2 +- .../fdroid/installer/SystemInstaller.java | 2 +- .../fdroid/views/ManageReposActivity.java | 2 +- .../views/fragments/PreferencesFragment.java | 2 +- .../views/fragments/RepoDetailsFragment.java | 2 +- 8 files changed, 10 insertions(+), 29 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index f0a4d2fc4..76d17a2a0 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -21,7 +21,6 @@ package org.fdroid.fdroid; import android.app.Activity; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.bluetooth.BluetoothAdapter; import android.content.ActivityNotFoundException; @@ -43,6 +42,7 @@ import android.support.v4.app.ListFragment; import android.support.v4.app.NavUtils; import android.support.v4.view.MenuItemCompat; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AlertDialog; import android.text.Html; import android.text.Layout; import android.text.Selection; diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java index e1fcea10d..4a525cbf7 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroid.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java @@ -19,7 +19,6 @@ package org.fdroid.fdroid; -import android.app.AlertDialog; import android.app.NotificationManager; import android.app.SearchManager; import android.bluetooth.BluetoothAdapter; @@ -30,13 +29,12 @@ import android.content.pm.PackageInfo; import android.content.res.Configuration; import android.database.ContentObserver; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.util.Log; -import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -279,16 +277,7 @@ public class FDroid extends ActionBarActivity { return true; case R.id.action_about: - View view; - if (Build.VERSION.SDK_INT >= 11) { - LayoutInflater li = LayoutInflater.from(this); - view = li.inflate(R.layout.about, null); - } else { - view = View.inflate( - new ContextThemeWrapper(this, R.style.AboutDialogLight), - R.layout.about, null); - } - + View view = LayoutInflater.from(this).inflate(R.layout.about, null); // Fill in the version... try { PackageInfo pi = getPackageManager() @@ -299,15 +288,7 @@ public class FDroid extends ActionBarActivity { } catch (Exception ignored) { } - AlertDialog.Builder builder; - if (Build.VERSION.SDK_INT >= 11) { - builder = new AlertDialog.Builder(this).setView(view); - } else { - builder = new AlertDialog.Builder( - new ContextThemeWrapper( - this, R.style.AboutDialogLight) - ).setView(view); - } + AlertDialog.Builder builder = new AlertDialog.Builder(this).setView(view); final AlertDialog alrt = builder.create(); alrt.setTitle(getString(R.string.about_title)); alrt.setButton(AlertDialog.BUTTON_NEUTRAL, diff --git a/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java index 3c2c0c5aa..f3c18ab5b 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java @@ -18,7 +18,6 @@ package org.fdroid.fdroid.installer; import android.annotation.TargetApi; -import android.app.AlertDialog; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -29,6 +28,7 @@ import android.content.pm.PermissionInfo; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Parcel; +import android.support.v7.app.AlertDialog; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java index cb4717b2b..ded1cabb3 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java @@ -20,7 +20,6 @@ package org.fdroid.fdroid.installer; import android.app.Activity; -import android.app.AlertDialog; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -32,6 +31,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.app.FragmentActivity; import android.support.v4.app.NotificationCompat; +import android.support.v7.app.AlertDialog; import android.text.Html; import android.util.Log; import android.view.ContextThemeWrapper; diff --git a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java index 8794409ec..0a1cd08e2 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java @@ -21,7 +21,6 @@ package org.fdroid.fdroid.installer; import android.app.Activity; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -30,6 +29,7 @@ import android.content.pm.IPackageInstallObserver; import android.content.pm.PackageManager; import android.net.Uri; import android.os.RemoteException; +import android.support.v7.app.AlertDialog; import android.util.Log; import org.fdroid.fdroid.R; diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java index 1b2af6c3d..b895f6a14 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java @@ -19,7 +19,6 @@ package org.fdroid.fdroid.views; -import android.app.AlertDialog; import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; @@ -42,6 +41,7 @@ import android.support.v4.app.NavUtils; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index 55752e9b9..c9373dd16 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -1,6 +1,5 @@ package org.fdroid.fdroid.views.fragments; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -11,6 +10,7 @@ import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; import android.support.v4.preference.PreferenceFragment; +import android.support.v7.app.AlertDialog; import android.text.Html; import android.text.TextUtils; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java index 630fee3e0..9986b9149 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java @@ -2,7 +2,6 @@ package org.fdroid.fdroid.views.fragments; import android.annotation.TargetApi; import android.app.Activity; -import android.app.AlertDialog; import android.content.ContentValues; import android.content.DialogInterface; import android.content.Intent; @@ -11,6 +10,7 @@ import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.MenuItemCompat; +import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher;