T28101

T28063

diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java
index 69089e5..6706923 100644 (file)
--- a/workspace/EverClip/gen/com/yuji/ec/R.java
+++ b/workspace/EverClip/gen/com/yuji/ec/R.java
@@ -78,44 +78,44 @@ public final class R {
         public static final int cancelButton=0x7f050006;
         public static final int closeButton=0x7f050007;
         public static final int deleteButton=0x7f050005;
-        public static final int mainConfirmTitle=0x7f050026;
+        public static final int mainConfirmTitle=0x7f05000a;
         public static final int mainMenuSetting=0x7f050008;
         public static final int mainTitle=0x7f050009;
         public static final int noButton=0x7f050003;
         public static final int noteTypeConfirmTitle=0x7f050028;
-        public static final int noteTypeDialogTitle=0x7f05001c;
-        public static final int noteTypeTitle=0x7f05001b;
+        public static final int noteTypeDialogTitle=0x7f05001d;
+        public static final int noteTypeTitle=0x7f05001c;
         public static final int selectTitle=0x7f050027;
         public static final int sendButton=0x7f050001;
-        public static final int settingConfirmNoteMsg=0x7f05000c;
-        public static final int settingConfirmTitle=0x7f05000a;
-        public static final int settingConfirmUserMsg=0x7f05000b;
-        public static final int settingNoteButton=0x7f050010;
-        public static final int settingNoteTitle=0x7f05000f;
-        public static final int settingSortTitle=0x7f050011;
-        public static final int settingTimeButton=0x7f050015;
+        public static final int settingConfirmNoteMsg=0x7f05000d;
+        public static final int settingConfirmTitle=0x7f05000b;
+        public static final int settingConfirmUserMsg=0x7f05000c;
+        public static final int settingNoteButton=0x7f050011;
+        public static final int settingNoteTitle=0x7f050010;
+        public static final int settingSortTitle=0x7f050012;
+        public static final int settingTimeButton=0x7f050016;
         public static final int settingTimeText=0x7f05002a;
-        public static final int settingTimeTitle=0x7f050014;
-        public static final int settingUpdateButton=0x7f050013;
-        public static final int settingUpdateTitle=0x7f050012;
-        public static final int settingUserButton=0x7f05000e;
-        public static final int settingUserTitle=0x7f05000d;
-        public static final int toastConnect=0x7f050020;
-        public static final int toastEvernoteSystem=0x7f050024;
-        public static final int toastFailedToGetList=0x7f050022;
-        public static final int toastFailedToWrite=0x7f05001f;
-        public static final int toastInvalidAuth=0x7f050023;
-        public static final int toastNoteDoesNotExist=0x7f050021;
-        public static final int toastSystem=0x7f050025;
+        public static final int settingTimeTitle=0x7f050015;
+        public static final int settingUpdateButton=0x7f050014;
+        public static final int settingUpdateTitle=0x7f050013;
+        public static final int settingUserButton=0x7f05000f;
+        public static final int settingUserTitle=0x7f05000e;
+        public static final int toastConnect=0x7f050021;
+        public static final int toastEvernoteSystem=0x7f050025;
+        public static final int toastFailedToGetList=0x7f050023;
+        public static final int toastFailedToWrite=0x7f050020;
+        public static final int toastInvalidAuth=0x7f050024;
+        public static final int toastNoteDoesNotExist=0x7f050022;
+        public static final int toastSystem=0x7f050026;
         public static final int updateButton=0x7f050004;
-        public static final int updatorConfirmTitle=0x7f050016;
-        public static final int updatorMessage=0x7f050017;
-        public static final int updatorNoteButton=0x7f050019;
-        public static final int updatorNoteDialogTitle=0x7f05001a;
+        public static final int updatorConfirmTitle=0x7f050017;
+        public static final int updatorMessage=0x7f050018;
+        public static final int updatorNoteButton=0x7f05001a;
+        public static final int updatorNoteDialogTitle=0x7f05001b;
         public static final int updatorNoteText=0x7f050029;
-        public static final int updatorNoteTitle=0x7f050018;
-        public static final int userPasswordTitle=0x7f05001e;
-        public static final int userUserTitle=0x7f05001d;
+        public static final int updatorNoteTitle=0x7f050019;
+        public static final int userPasswordTitle=0x7f05001f;
+        public static final int userUserTitle=0x7f05001e;
         public static final int yesButton=0x7f050002;
     }
 }

diff --git a/workspace/EverClip/res/values/strings.xml b/workspace/EverClip/res/values/strings.xml
index f2686cd..3aff375 100644 (file)
--- a/workspace/EverClip/res/values/strings.xml
+++ b/workspace/EverClip/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="mainMenuSetting">設定</string>
     
        <string name="mainTitle">EverMemo</string>
+       <string name="mainConfirmTitle">フィルター</string>
 
     <string name="settingConfirmTitle">確認</string>
     <string name="settingConfirmUserMsg">Evernoteにログインするための、ユーザ/パスワードを設定してください</string>

diff --git a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
index 2db4f00..143c044 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
@@ -7,6 +7,7 @@ import java.util.List;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.format.DateUtils;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -80,6 +81,15 @@ public class EverClipActivity extends BaseActivity {
        }
 
        @Override
+       public boolean onKeyDown(int keyCode, KeyEvent event) {
+               if (keyCode != KeyEvent.KEYCODE_BACK) {
+                       return super.onKeyDown(keyCode, event);
+               } else {
+                       finish();
+                       return false;
+               }
+       }       
+       @Override
        protected void onStart() {
                super.onStart();
 
@@ -149,8 +159,11 @@ public class EverClipActivity extends BaseActivity {
                        }
                        updateList(str);
                } else {
-                       layoutView.setVisibility(View.GONE);
-                       updateList(null);
+                       // TODO\81@\97l\8eq\8c©\82é
+                       //layoutView.setVisibility(View.GONE);
+                       //updateList(null);
+                       Intent intent = new Intent(this, (Class<?>) SettingActivity.class);
+                       startActivityForResult(intent, 0);
                }               
        }