Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use AlertDialog from the support library

Browse Source 
This unifies look of alert dialogs across various Android versions and
allows proper tinting.
This commit is contained in:
relan 2015-07-20 11:17:40 +03:00
parent c9f6be61b5
commit 4b699d5376
8 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -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;

25
F-Droid/src/org/fdroid/fdroid/FDroid.java
View File

@ -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,

2
F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
View File

@ -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;

2
F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
View File

@ -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;

2
F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
View File

@ -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;

2
F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
View File

@ -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;

2
F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -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;

2
F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
View File

@ -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;