Merge "Make the Phone options dialog use current language" into gingerbread

This commit is contained in:
Dianne Hackborn
2011-01-14 15:33:44 -08:00
committed by Android (Google) Code Review

View File

@@ -221,8 +221,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
final AlertDialog.Builder ab = new AlertDialog.Builder(mContext); final AlertDialog.Builder ab = new AlertDialog.Builder(mContext);
ab.setAdapter(mAdapter, this) ab.setAdapter(mAdapter, this)
.setInverseBackgroundForced(true) .setInverseBackgroundForced(true);
.setTitle(R.string.global_actions);
final AlertDialog dialog = ab.create(); final AlertDialog dialog = ab.create();
dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
@@ -249,6 +248,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
} else { } else {
mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
} }
mDialog.setTitle(R.string.global_actions);
} }