Merge "Make the Phone options dialog use current language"

Dianne Hackborn · Android Code Review · commit c3d0d860b6f9 · 2011-01-14T15:36:58.000-08:00
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -221,8 +221,7 @@ public boolean showBeforeProvisioning() {
         final AlertDialog.Builder ab = new AlertDialog.Builder(mContext);
 
         ab.setAdapter(mAdapter, this)
-                .setInverseBackgroundForced(true)
-                .setTitle(R.string.global_actions);
+                .setInverseBackgroundForced(true);
 
         final AlertDialog dialog = ab.create();
         dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
@@ -249,6 +248,7 @@ private void prepareDialog() {
         } else {
             mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
         }
+        mDialog.setTitle(R.string.global_actions);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,7 @@ public boolean showBeforeProvisioning() {`
`221`	`221`	`final AlertDialog.Builder ab = new AlertDialog.Builder(mContext);`
`222`	`222`
`223`	`223`	`ab.setAdapter(mAdapter, this)`
`224`		`- .setInverseBackgroundForced(true)`
`225`		`- .setTitle(R.string.global_actions);`
	`224`	`+ .setInverseBackgroundForced(true);`
`226`	`225`
`227`	`226`	`final AlertDialog dialog = ab.create();`
`228`	`227`	`dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);`
`@@ -249,6 +248,7 @@ private void prepareDialog() {`
`249`	`248`	`} else {`
`250`	`249`	`mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);`
`251`	`250`	`}`
	`251`	`+ mDialog.setTitle(R.string.global_actions);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`