diff --git a/doc/小米便签维护方案及成果报告.docx b/doc/小米便签维护方案及成果报告.docx
index f8215a0..381e892 100644
Binary files a/doc/小米便签维护方案及成果报告.docx and b/doc/小米便签维护方案及成果报告.docx differ
diff --git a/src/Notes1/app/src/main/AndroidManifest.xml.orig b/src/Notes1/app/src/main/AndroidManifest.xml.orig
new file mode 100644
index 0000000..e66255d
--- /dev/null
+++ b/src/Notes1/app/src/main/AndroidManifest.xml.orig
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> origin/ChiYanZhen_branch
+
+
+
+
+
+
+
+
+
+
+
+
+<<<<<<< HEAD
+
+
+
+
+
+
+
+
+
+
+=======
+
+>>>>>>> origin/ChiYanZhen_branch
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> origin/ChiYanZhen_branch
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 8fcd915..189a5f6 100644
--- a/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -764,6 +764,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mState = ListEditState.NOTE_LIST;
startAsyncNotesListQuery();
mTitleBar.setVisibility(View.GONE);
+ mAddNewNote.setVisibility(View.VISIBLE);
break;
default:
break;
@@ -924,7 +925,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
break;
}
case R.id.menu_bg_change:{
- showListDialog();
+ replaceBackGround();
break;
}
case R.id.menu_trash_folder:{
@@ -949,6 +950,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
startAsyncNotesListQuery();
mTitleBar.setText("回收站");
mTitleBar.setVisibility(View.VISIBLE);
+ mAddNewNote.setVisibility(View.GONE);
}
private void exportNoteToText() {
@@ -1101,32 +1103,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
enter_password_dialog.dismiss();
}
});
-
- //如果文本内是空的，禁止按下positive键
- /*if (TextUtils.isEmpty(etpassword.getText())) {
- positive.setEnabled(false);
- }*/
-
- /*etpassword.addTextChangedListener(new TextWatcher() {
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
- // TODO Auto-generated method stub
-
- }
-
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- if (TextUtils.isEmpty(etName.getText())) {
- positive.setEnabled(false);
- } else {
- positive.setEnabled(true);
- }
- }
-
- public void afterTextChanged(Editable s) {
- // TODO Auto-generated method stub
-
- }
- });*/
-
}
private class OnListItemClickListener implements OnItemClickListener {
@@ -1318,7 +1294,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
- public void showListDialog() {
+ public void replaceBackGround() {
final String[] items = {"从相册选取", "拍摄照片"};
AlertDialog.Builder listDialog = new AlertDialog.Builder(NotesListActivity.this);
listDialog.setTitle("背景");
diff --git a/src/Notes1/app/src/main/res/layout/note_edit.xml b/src/Notes1/app/src/main/res/layout/note_edit.xml
index b749607..3c81fad 100644
--- a/src/Notes1/app/src/main/res/layout/note_edit.xml
+++ b/src/Notes1/app/src/main/res/layout/note_edit.xml
@@ -99,11 +99,7 @@
android:layout_marginRight="8dip"
android:textAppearance="@style/TextAppearanceSecondaryItem" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+