moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Use ContextThemeWrapper for "Send as" dialog

Browse Source 
The old code changed the theme of the activity by wrongly using
ContextWrapper + setTheme().
This commit is contained in:
cketti 2012-09-16 03:16:29 +02:00
parent 9afaaa1e6e
commit 163557ae8a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -6,7 +6,6 @@ import android.app.AlertDialog.Builder;
import android.app.Dialog; import android.app.Dialog;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
@ -26,6 +25,7 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window; import com.actionbarsherlock.view.Window;
import android.view.ContextThemeWrapper;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.View.OnFocusChangeListener; import android.view.View.OnFocusChangeListener;
@ -2327,11 +2327,11 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}) })
.create(); .create();
case DIALOG_CHOOSE_IDENTITY: case DIALOG_CHOOSE_IDENTITY:
Context context = new ContextWrapper(this); Context context = new ContextThemeWrapper(this,
context.setTheme(K9.getK9ThemeResourceId(K9.THEME_LIGHT)); K9.getK9ThemeResourceId(K9.THEME_LIGHT));
Builder builder = new AlertDialog.Builder(context); Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.send_as); builder.setTitle(R.string.send_as);
final IdentityAdapter adapter = new IdentityAdapter(context, getLayoutInflater()); final IdentityAdapter adapter = new IdentityAdapter(context);
builder.setAdapter(adapter, new DialogInterface.OnClickListener() { builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
@ -3487,8 +3487,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
private LayoutInflater mLayoutInflater; private LayoutInflater mLayoutInflater;
private List<Object> mItems; private List<Object> mItems;
public IdentityAdapter(Context context, LayoutInflater layoutInflater) { public IdentityAdapter(Context context) {
mLayoutInflater = layoutInflater; mLayoutInflater = (LayoutInflater) context.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
List<Object> items = new ArrayList<Object>(); List<Object> items = new ArrayList<Object>();
Preferences prefs = Preferences.getPreferences(context.getApplicationContext()); Preferences prefs = Preferences.getPreferences(context.getApplicationContext());