From a5d6fb9e2a4f90326e08b82118e682a91e8c864b Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Sat, 21 Apr 2012 11:45:53 +0900
Subject: [PATCH] T28135 T28134

---
 workspace/EverClip/AndroidManifest.xml             |  3 --
 workspace/EverClip/res/layout/note_updator.xml     |  2 +-
 .../src/com/yuji/ec/NoteTypeListActivity.java      | 37 +++++++++++++++-------
 .../src/com/yuji/ec/NoteUpdatorActivity.java       |  1 +
 .../EverClip/src/com/yuji/ec/SettingActivity.java  |  3 ++
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/workspace/EverClip/AndroidManifest.xml b/workspace/EverClip/AndroidManifest.xml
index 26c08a6..b244852 100644
--- a/workspace/EverClip/AndroidManifest.xml
+++ b/workspace/EverClip/AndroidManifest.xml
@@ -23,9 +23,6 @@
 				<category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-<!-->
-    	<activity android:name=".SettingActivity"></activity>
-  -->
       	<activity android:name=".UserPasswordActivity"></activity>
     	<activity android:name=".NoteTypeListActivity"></activity>
     	<activity android:name=".NoteUpdatorActivity"></activity>
diff --git a/workspace/EverClip/res/layout/note_updator.xml b/workspace/EverClip/res/layout/note_updator.xml
index 8108d30..0a848a7 100644
--- a/workspace/EverClip/res/layout/note_updator.xml
+++ b/workspace/EverClip/res/layout/note_updator.xml
@@ -14,7 +14,7 @@
 			<TextView android:text="@+string/updatorNoteTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
     		<Spinner android:id="@+id/updatorNoteSpinner" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginLeft="5px"></Spinner>
 			<LinearLayout android:id="@+id/updatorNoteLayout" android:layout_width="fill_parent" android:layout_height="wrap_content">
-				<TextView android:id="@+id/updatorNoteText" android:text="@+string/updatorNoteText" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="left|center" android:background="#cccccc" android:layout_width="wrap_content" android:layout_weight="1" android:layout_height="fill_parent" android:layout_marginLeft="10px" android:paddingLeft="10px"></TextView>
+				<TextView android:id="@+id/updatorNoteText" android:text="@+string/updatorNoteText" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="left|center" android:scrollHorizontally="true" android:ellipsize="end" android:background="#cccccc" android:layout_width="wrap_content" android:layout_weight="1" android:layout_height="fill_parent" android:layout_marginLeft="10px" android:paddingLeft="10px"></TextView>
 				<Button android:id="@+id/updatorNoteButton" android:text="@+string/updatorNoteButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
 			</LinearLayout>	
 		</LinearLayout>
diff --git a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
index 2dcab49..f1b9879 100644
--- a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
@@ -28,6 +28,7 @@ import com.yuji.ec.utility.EvernoteUtil.Error;
 public class NoteTypeListActivity extends BaseActivity {
 	private EditPrefUtil pref = new EditPrefUtil(this);
 
+	private static List<NoteListItem> itemList = null;
 	private LinearLayout layoutView = null;
 	private TextView messageText = null;
 	private ListView listView = null;
@@ -58,14 +59,18 @@ public class NoteTypeListActivity extends BaseActivity {
 		closeButon.setEnabled(false);
 		
 		// updateList();
-		int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE_TMP,
-				Constant.NOTE_ITEM_TYPE_ALL);
-		NoteTypeListTask task = new NoteTypeListTask(this, noteItemType);
-		AsyncTaskCommand command = new AsyncTaskCommand(this, task);
-		command.setTitle(getString(R.string.noteTypeDialogTitle));
-		command.setButtonTitle(getString(R.string.cancelButton));
-		command.execute("");
-		
+		if (itemList == null){
+			int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE_TMP,
+					Constant.NOTE_ITEM_TYPE_ALL);
+			NoteTypeListTask task = new NoteTypeListTask(this, noteItemType);
+			AsyncTaskCommand command = new AsyncTaskCommand(this, task);
+			command.setTitle(getString(R.string.noteTypeDialogTitle));
+			command.setButtonTitle(getString(R.string.cancelButton));
+			command.execute("");
+		}
+		else {
+			setList(itemList);			
+		}
 		setStatus();
 	}
 
@@ -108,16 +113,26 @@ public class NoteTypeListActivity extends BaseActivity {
 			NoteListItem item = new NoteListItem(iItem.getText(), iItem);
 			itemList.add(item);
 		}
+		
+		setList(itemList);
+
+		setStatus();
+	}
 
+	private void setList(List<NoteListItem> itemList) {
 		NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this,
 				R.layout.simple_list_item_1, itemList);
 		listView.setAdapter(adapter);
-
-		closeButon.setEnabled(true);
-		setStatus();
+		
+		NoteTypeListActivity.itemList = itemList;
 	}
 
 	private void setStatus() {
+		closeButon.setEnabled(itemList != null);
 		layoutView.setVisibility(View.GONE);
 	}
+	
+	public static void init(){
+		itemList = null;
+	}
 }
diff --git a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
index 9c3f269..2edf66b 100644
--- a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
@@ -142,6 +142,7 @@ public class NoteUpdatorActivity extends BaseActivity {
 	}
 
 	private void noteTypeButtonOnClick() {
+		NoteTypeListActivity.init();
 		Intent intent = new Intent(this, (Class<?>) NoteTypeListActivity.class);
 		startActivityForResult(intent, 0);
 	}
diff --git a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
index 5acb552..5d9723b 100644
--- a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
@@ -453,6 +453,7 @@ public class SettingActivity extends BaseActivity {
 			sortRadio1.setEnabled(false);
 			sortRadio2.setEnabled(false);
 			timeCheckBox.setEnabled(false);
+			timeButton.setEnabled(false);
 			return;
 		}
 
@@ -465,6 +466,7 @@ public class SettingActivity extends BaseActivity {
 			sortRadio1.setEnabled(false);
 			sortRadio2.setEnabled(false);
 			timeCheckBox.setEnabled(false);
+			timeButton.setEnabled(false);
 			return;
 		}
 
@@ -474,6 +476,7 @@ public class SettingActivity extends BaseActivity {
 		sortRadio1.setEnabled(true);
 		sortRadio2.setEnabled(true);
 		timeCheckBox.setEnabled(true);
+		timeButton.setEnabled(true);
 	}
 
 	public static void init(Context context) {
-- 
2.11.0