T28135

T28134

diff --git a/workspace/EverClip/AndroidManifest.xml b/workspace/EverClip/AndroidManifest.xml
index 26c08a6..b244852 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 {\r
        private EditPrefUtil pref = new EditPrefUtil(this);\r
 \r
+       private static List<NoteListItem> itemList = null;\r
        private LinearLayout layoutView = null;\r
        private TextView messageText = null;\r
        private ListView listView = null;\r
@@ -58,14 +59,18 @@ public class NoteTypeListActivity extends BaseActivity {
                closeButon.setEnabled(false);\r
                \r
                // updateList();\r
-               int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE_TMP,\r
-                               Constant.NOTE_ITEM_TYPE_ALL);\r
-               NoteTypeListTask task = new NoteTypeListTask(this, noteItemType);\r
-               AsyncTaskCommand command = new AsyncTaskCommand(this, task);\r
-               command.setTitle(getString(R.string.noteTypeDialogTitle));\r
-               command.setButtonTitle(getString(R.string.cancelButton));\r
-               command.execute("");\r
-               \r
+               if (itemList == null){\r
+                       int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE_TMP,\r
+                                       Constant.NOTE_ITEM_TYPE_ALL);\r
+                       NoteTypeListTask task = new NoteTypeListTask(this, noteItemType);\r
+                       AsyncTaskCommand command = new AsyncTaskCommand(this, task);\r
+                       command.setTitle(getString(R.string.noteTypeDialogTitle));\r
+                       command.setButtonTitle(getString(R.string.cancelButton));\r
+                       command.execute("");\r
+               }\r
+               else {\r
+                       setList(itemList);                      \r
+               }\r
                setStatus();\r
        }\r
 \r
@@ -108,16 +113,26 @@ public class NoteTypeListActivity extends BaseActivity {
                        NoteListItem item = new NoteListItem(iItem.getText(), iItem);\r
                        itemList.add(item);\r
                }\r
+               \r
+               setList(itemList);\r
+\r
+               setStatus();\r
+       }\r
 \r
+       private void setList(List<NoteListItem> itemList) {\r
                NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this,\r
                                R.layout.simple_list_item_1, itemList);\r
                listView.setAdapter(adapter);\r
-\r
-               closeButon.setEnabled(true);\r
-               setStatus();\r
+               \r
+               NoteTypeListActivity.itemList = itemList;\r
        }\r
 \r
        private void setStatus() {\r
+               closeButon.setEnabled(itemList != null);\r
                layoutView.setVisibility(View.GONE);\r
        }\r
+       \r
+       public static void init(){\r
+               itemList = null;\r
+       }\r
 }\r

diff --git a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
index 9c3f269..2edf66b 100644 (file)
--- 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 (file)
--- 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) {