T28004

[evermemo/source.git] / workspace / EverMemo / src / com / yuji / em / SelectNoteListActivity.java

diff --git a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
index a7bc357..a655946 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
@@ -185,22 +185,34 @@ public class SelectNoteListActivity extends BaseActivity {
                                messageView.setText(R.string.selectListConfirmNoteMsg);
                                selectListView.setEnabled(true);
                                editButton.setVisibility(View.VISIBLE);
-                               editButton.setEnabled(isSelected());
+                               editButton.setEnabled(false);
                                deleteButton.setVisibility(View.VISIBLE);
                                deleteButton.setEnabled(false);
                                yesButton.setVisibility(View.GONE);
                                noButton.setVisibility(View.GONE);
-                       } else {
+                       } if (!isSelected()){
                                messageLayout.setVisibility((isEmpty) ? View.VISIBLE
                                                : View.GONE);
                                selectListView.setEnabled(true);
                                editButton.setVisibility(View.VISIBLE);
-                               editButton.setEnabled(isSelected());
+                               editButton.setEnabled(false);
                                deleteButton.setVisibility(View.VISIBLE);
                                deleteButton.setEnabled(false);
                                yesButton.setVisibility(View.GONE);
                                noButton.setVisibility(View.GONE);
                        }
+                       else {
+                               messageLayout.setVisibility((isEmpty) ? View.VISIBLE
+                                               : View.GONE);
+                               selectListView.setEnabled(true);
+                               editButton.setVisibility(View.VISIBLE);
+                               editButton.setEnabled(true);
+                               Note item = (Note) selectListView.getItemAtPosition(selectedIndex);
+                               deleteButton.setVisibility(View.VISIBLE);
+                               deleteButton.setEnabled(!CommonUtil.isNull(item.getTitle()));
+                               yesButton.setVisibility(View.GONE);
+                               noButton.setVisibility(View.GONE);
+                       }
                } else if (view == selectListView) {
                        messageLayout.setVisibility((isEmpty) ? View.VISIBLE : View.GONE);
                        selectListView.setEnabled(true);
@@ -208,7 +220,7 @@ public class SelectNoteListActivity extends BaseActivity {
                        editButton.setEnabled(isSelected());
                        Note item = (Note) selectListView.getItemAtPosition(selectedIndex);
                        deleteButton.setVisibility(View.VISIBLE);
-                       deleteButton.setEnabled(!CommonUtil.isNull(item.getTitle()));
+                       deleteButton.setEnabled(isSelected() && !CommonUtil.isNull(item.getTitle()));
                        yesButton.setVisibility(View.GONE);
                        noButton.setVisibility(View.GONE);
                } else if (view == deleteButton) {