openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 949b3eb9: Merge change 7136 into donut 

Merge commit '949b3eb9d3ced2a068fcec5a96a2d8b0e90d2fa2'

* commit '949b3eb9d3ced2a068fcec5a96a2d8b0e90d2fa2':
  Fix the lock issue on Home. This was caused by onPrepareDialog().
This commit is contained in:
Android (Google) Code Review 2009-07-14 14:52:57 -07:00 committed by The Android Open Source Project
parent 2cef9ae6c8 949b3eb9d3
commit 2962125fe9
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/launcher/Launcher.java
View File

@ -2014,14 +2014,14 @@ public final class Launcher extends Activity implements View.OnClickListener, On
protected void onPrepareDialog(int id, Dialog dialog) {
switch (id) {
case DIALOG_CREATE_SHORTCUT:
mWorkspace.lock();
break;
case DIALOG_RENAME_FOLDER:
mWorkspace.lock();
EditText input = (EditText) dialog.findViewById(R.id.folder_name);
final CharSequence text = mFolderInfo.title;
input.setText(text);
input.setSelection(0, text.length());
if (mFolderInfo != null) {
EditText input = (EditText) dialog.findViewById(R.id.folder_name);
final CharSequence text = mFolderInfo.title;
input.setText(text);
input.setSelection(0, text.length());
}
break;
}
}
@ -2090,7 +2090,15 @@ public final class Launcher extends Activity implements View.OnClickListener, On
}
);
builder.setView(layout);
return builder.create();
final AlertDialog dialog = builder.create();
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
public void onShow(DialogInterface dialog) {
mWorkspace.lock();
}
});
return dialog;
}
private void changeFolderName() {
@ -2133,7 +2141,9 @@ public final class Launcher extends Activity implements View.OnClickListener, On
* appropriate activity.
*/
private class CreateShortcut implements DialogInterface.OnClickListener,
DialogInterface.OnCancelListener, DialogInterface.OnDismissListener {
DialogInterface.OnCancelListener, DialogInterface.OnDismissListener,
DialogInterface.OnShowListener {
private AddAdapter mAdapter;
Dialog createDialog() {
@ -2150,6 +2160,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
AlertDialog dialog = builder.create();
dialog.setOnCancelListener(this);
dialog.setOnDismissListener(this);
dialog.setOnShowListener(this);
return dialog;
}
@ -2239,6 +2250,10 @@ public final class Launcher extends Activity implements View.OnClickListener, On
}
}
}
public void onShow(DialogInterface dialog) {
mWorkspace.lock();
}
}
/**