From 4b22bd966aa99aa5dc9cb237d2631f318ca0469d Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Tue, 17 Apr 2012 12:34:42 +0900
Subject: [PATCH] T28099

---
 workspace/EverClip/AndroidManifest.xml                      | 6 ++++--
 workspace/EverClip/res/values/strings.xml                   | 4 ++--
 workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java | 8 +++++++-
 workspace/EverClip/src/com/yuji/ec/SettingActivity.java     | 7 ++-----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/workspace/EverClip/AndroidManifest.xml b/workspace/EverClip/AndroidManifest.xml
index da9fbc8..26c08a6 100644
--- a/workspace/EverClip/AndroidManifest.xml
+++ b/workspace/EverClip/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <application android:icon="@drawable/icon" android:label="@string/app_name"
 	    android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen">
-        <activity android:name=".EverClipActivity"
+        <activity android:name=".SettingActivity"
                   android:label="@string/app_name"
                   android:launchMode="singleTop">
             <intent-filter>
@@ -23,8 +23,10 @@
 				<category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+<!-->
     	<activity android:name=".SettingActivity"></activity>
-    	<activity android:name=".UserPasswordActivity"></activity>
+  -->
+      	<activity android:name=".UserPasswordActivity"></activity>
     	<activity android:name=".NoteTypeListActivity"></activity>
     	<activity android:name=".NoteUpdatorActivity"></activity>
 	    <service android:enabled="true" android:name=".service.NoteUpdatorService" />
diff --git a/workspace/EverClip/res/values/strings.xml b/workspace/EverClip/res/values/strings.xml
index e55ff6f..f2686cd 100644
--- a/workspace/EverClip/res/values/strings.xml
+++ b/workspace/EverClip/res/values/strings.xml
@@ -16,7 +16,7 @@
 
     <string name="settingConfirmTitle">確認</string>
     <string name="settingConfirmUserMsg">Evernoteにログインするための、ユーザ/パスワードを設定してください</string>
-    <string name="settingConfirmNoteMsg">入力元のノートを設定してください</string>
+    <string name="settingConfirmNoteMsg">ノート一覧取得先を設定してください</string>
     <string name="settingUserTitle">ユーザ</string>
     <string name="settingUserButton">ユーザ/パスワードを設定する</string>
     <string name="settingNoteTitle">ノート一覧取得先</string>
@@ -28,7 +28,7 @@
     <string name="settingTimeButton">更新</string>
 
 	<string name="updatorConfirmTitle">確認</string>
-	<string name="updatorMessage">ノート取得先の種類(全てのノート、指定したノートブック、指定したタグ)を選択してください。ノートブック、タグを選択した場合は、「更新」ボタンを押して、ノートブック、タグを選択してください</string>
+	<string name="updatorMessage">ノート取得先の種類\n・全てのノート\n・ノートブック\n・タグ\nを選択してください。\nノートブック、タグを選択した場合は、「更新」ボタンを押して、ノートブック、タグを選択してください。</string>
 	<string name="updatorNoteTitle">ノート取得先の種類</string>
     <string name="updatorNoteButton">更新</string>
     <string name="updatorNoteDialogTitle">更新中</string>
diff --git a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
index 296ab22..6eacb2e 100644
--- a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
@@ -26,6 +26,7 @@ import com.yuji.ec.utility.EvernoteUtil;
 public class NoteUpdatorActivity extends BaseActivity {
 	private EditPrefUtil pref = new EditPrefUtil(this);
 
+	private TextView updatorMessage = null;
 	private LinearLayout noteLayout = null;
 	private Spinner noteTypeSpinner = null;
 	private LinearLayout noteTypeLayout = null;
@@ -42,6 +43,7 @@ public class NoteUpdatorActivity extends BaseActivity {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.note_updator);
 
+		updatorMessage = (TextView) this.findViewById(R.id.updatorMessage);
 		noteLayout = (LinearLayout) this.findViewById(R.id.updatorLayout);
 		noteTypeSpinner = (Spinner) this.findViewById(R.id.updatorNoteSpinner);
 		noteTypeLayout = (LinearLayout) this
@@ -78,6 +80,10 @@ public class NoteUpdatorActivity extends BaseActivity {
 			}
 		});
 
+		String msg = getString(R.string.updatorMessage);
+		msg = CommonUtil.replaceString(msg, "\\\\n", "\n");
+		updatorMessage.setText(msg);
+		
 		ArrayAdapter<CharSequence> noteTypeAdapter = ArrayAdapter
 				.createFromResource(this, R.array.note_item_array,
 						android.R.layout.simple_spinner_item);
@@ -137,7 +143,7 @@ public class NoteUpdatorActivity extends BaseActivity {
 
 	private void noteTypeButtonOnClick() {
 		Intent intent = new Intent(this, (Class<?>) NoteTypeListActivity.class);
-		startActivityForResult(intent, 0); // TODO
+		startActivityForResult(intent, 0);
 	}
 
 	private void updateButtonOnClick() {
diff --git a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
index ac22851..a510ba1 100644
--- a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
@@ -368,7 +368,7 @@ public class SettingActivity extends BaseActivity {
 	private void noteButtonOnClick() {
 		NoteUpdatorActivity.init(this);
 		Intent intent = new Intent(this, (Class<?>) NoteUpdatorActivity.class);
-		startActivityForResult(intent, 1); // TODO
+		startActivityForResult(intent, 0);
 	}
 
 	private void sortSpinnerItemSelected(AdapterView<?> parent, View view,
@@ -497,9 +497,6 @@ public class SettingActivity extends BaseActivity {
 	}
 
 	public static void init(Context context) {
-		// EditPrefUtil pref = new EditPrefUtil(context);
-		//
-		// pref.put(Constant.PREF_UPDATE_TIME_TMP, -1);
-		// pref.update();
+
 	}
 }
-- 
2.11.0