Commit: 266cf5d2003a2b36db4930ce1bc600770eadd87f - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• Révision: 266cf5d2003a2b36db4930ce1bc600770eadd87f (tree)
• l'heure: 2013-06-26 17:14:50
• Auteur: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Message de Log

notepad-app-level11 にテキスト受信機能の有効無効の設定を実装

Change Summary

• modified: notepad-app-level-11/res/values-ja/strings_preferences.xml
• modified: notepad-app-level-11/res/values/preference.xml
• modified: notepad-app-level-11/res/values/strings_preference.xml
• modified: notepad-app-level-11/res/xml/notepad_preference.xml
• modified: notepad-app-level-11/src/org/routine_work/notepad/prefs/NotepadPreferenceActivity.java
• modified: notepad-app/src/org/routine_work/notepad/prefs/NotepadPreferenceActivity.java

Modification

--- a/notepad-app-level-11/res/values-ja/strings_preferences.xml
+++ b/notepad-app-level-11/res/values-ja/strings_preferences.xml
@@ -52,16 +52,24 @@
 	<string name="note_list_sort_order_entry_date_added_desc" >作成日時の降順</string>
 	-->
 
-	<!-- AutoLink Category -->
+	<!-- Auto Link Category -->
 	<string name="note_autolink_category_title">自動リンク</string>
-	<!-- AutoLink : Note Title -->
+	<!-- Auto Link : Note Title -->
 	<string name="note_title_autolink_title">タイトル内の自動リンク</string>
-	<string name="note_title_autolink_summary_on">ノートのタイトル内のURLやメールアドレスは自動的にリンクされます。</string>
-	<string name="note_title_autolink_summary_off">ノートのタイトル内のURLやメールアドレスはリンクされません。</string>
-	<!-- AutoLink : Note Content -->
+	<string name="note_title_autolink_summary_on">ノートのタイトル内のURLやメールアドレスを自動的にリンクにします。</string>
+	<string name="note_title_autolink_summary_off">ノートのタイトル内のURLやメールアドレスをリンクにしません。</string>
+	<!-- Auto Link : Note Content -->
 	<string name="note_content_autolink_title">本文内の自動リンク</string>
-	<string name="note_content_autolink_summary_on">ノートの本文内のURLやメールアドレスは自動的にリンクされます。</string>
-	<string name="note_content_autolink_summary_off">ノートの本文内のURLやメールアドレスはリンクされません。</string>
+	<string name="note_content_autolink_summary_on">ノートの本文内のURLやメールアドレスを自動的にリンクにします。</string>
+	<string name="note_content_autolink_summary_off">ノートの本文内のURLやメールアドレスをリンクにしません。</string>
+
+	<!-- Share Data Category -->
+	<string name="share_data_category_title">データ共有</string>
+	<!-- Receive Text -->
+	<string name="receive_text_category_title">テキストの受け取り</string>
+	<string name="receive_text_title">テキストの受け取り</string>
+	<string name="receive_text_summary_on">テキストデータを受け取って新規ノートとして追加できます。</string>
+	<string name="receive_text_summary_off">テキストデータの受け取り機能は無効です。</string>
 
 	<!-- Backup and Restore Category -->
 	<string name="backup_and_restore">バックアップと復元</string>

--- a/notepad-app-level-11/res/values/preference.xml
+++ b/notepad-app-level-11/res/values/preference.xml
@@ -85,10 +85,17 @@
 		-->
 	</string-array>
 
-	<!-- note viewer auto link -->
+	<!-- Auto Link Category -->
+	<!-- Auto Link : Note Title -->
 	<string name="note_title_autolink_key" >note_title_autolink</string>
 	<bool name="note_title_autolink_default_value" >false</bool>
+	<!-- Auto Link : Note Content -->
 	<string name="note_content_autolink_key" >note_content_autolink</string>
 	<bool name="note_content_autolink_default_value" >true</bool>
 
+	<!-- Share Data Category -->
+	<!-- Share Data : Receive Text -->
+	<string name="receive_text_key" >receive_text</string>
+	<bool name="receive_text_default_value" >true</bool>
+
 </resources>

--- a/notepad-app-level-11/res/values/strings_preference.xml
+++ b/notepad-app-level-11/res/values/strings_preference.xml
@@ -52,19 +52,26 @@
 	<string name="note_list_sort_order_entry_date_added_desc" >created descending</string>
 	-->
 
-	<!-- AutoLink Category -->
+	<!-- Auto Link Category -->
 	<string name="note_autolink_category_title">Auto Link</string>
-	<!-- AutoLink : Note Title -->
+	<!-- Auto Link : Note Title -->
 	<string name="note_title_autolink_title">Auto Link in Title</string>
 	<string name="note_title_autolink_summary_on">The URL and the E-mail in the title are linked automatically.</string>
 	<string name="note_title_autolink_summary_off">The URL and the E-mail in the title are not linked.</string>
-	<!-- AutoLink : Note Content -->
+	<!-- Auto Link : Note Content -->
 	<string name="note_content_autolink_title">Auto Link in Text</string>
 	<string name="note_content_autolink_summary_on">The URL and the E-mail in the text are linked automatically.</string>
 	<string name="note_content_autolink_summary_off">The URL and the E-mail in the text are not linked.</string>
 
+	<!-- Share Data Category -->
+	<string name="share_data_category_title">Share Data</string>
+	<!-- Receive Text -->
+	<string name="receive_text_title">Receive Text</string>
+	<string name="receive_text_summary_on">The text intent receiving is enabled.</string>
+	<string name="receive_text_summary_off">The text intent receiving is disabled.</string>
+
 	<!-- Backup and Restore Category -->
-	<string name="backup_and_restore">Backup &amp; Restore</string>
+	<string name="backup_and_restore">Back up &amp; Restore</string>
 	<!-- Backup Data -->
 	<string name="backup_data">Backup Data</string>
 	<string name="backup_data_title">Backup Data</string>

--- a/notepad-app-level-11/res/xml/notepad_preference.xml
+++ b/notepad-app-level-11/res/xml/notepad_preference.xml
@@ -109,6 +109,16 @@
 		/>
 	</PreferenceCategory>
 
+	<PreferenceCategory android:title="@string/share_data_category_title" >
+		<CheckBoxPreference
+			android:key="@string/receive_text_key"
+			android:defaultValue="@bool/receive_text_default_value"
+			android:title="@string/receive_text_title"
+			android:summaryOn="@string/receive_text_summary_on"
+			android:summaryOff="@string/receive_text_summary_off"
+		/>
+	</PreferenceCategory>
+
 	<PreferenceCategory android:title="@string/backup_and_restore" >
 		<PreferenceScreen
 			android:title="@string/backup_data_title"

--- a/notepad-app-level-11/src/org/routine_work/notepad/prefs/NotepadPreferenceActivity.java
+++ b/notepad-app-level-11/src/org/routine_work/notepad/prefs/NotepadPreferenceActivity.java
@@ -23,7 +23,9 @@
  */
 package org.routine_work.notepad.prefs;
 
+import android.content.ComponentName;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
@@ -32,6 +34,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import org.routine_work.notepad.NotepadActivity;
 import org.routine_work.notepad.R;
+import org.routine_work.notepad.ReceiveTextActivity;
 import org.routine_work.utils.Log;
 
 /**
@@ -106,7 +109,33 @@ public class NotepadPreferenceActivity extends PreferenceActivity
 		Log.v(LOG_TAG, "Hello");
 		Log.i(LOG_TAG, "shared preference " + key + " is changed.");
 
-		updateSummary();
+		String receiveTextKey = getString(R.string.receive_text_key);
+		if (key.equals(receiveTextKey))
+		{
+			// update component enable/disable
+			boolean defaultValue = getResources().getBoolean(R.bool.receive_text_default_value);
+			boolean receiveTextEnabled = prefs.getBoolean(key, defaultValue);
+			int newState;
+
+			if (receiveTextEnabled)
+			{
+				newState = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+				Log.d(LOG_TAG, "Enable ReceiveTextActivity component");
+			}
+			else
+			{
+				newState = PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+				Log.d(LOG_TAG, "Disable ReceiveTextActivity component");
+			}
+
+			PackageManager packageManager = getPackageManager();
+			ComponentName componentName = new ComponentName(this, ReceiveTextActivity.class);
+			packageManager.setComponentEnabledSetting(componentName, newState, PackageManager.DONT_KILL_APP); // dont stop
+		}
+		else
+		{
+			updateSummary();
+		}
 
 		Log.v(LOG_TAG, "Bye");
 	}

--- a/notepad-app/src/org/routine_work/notepad/prefs/NotepadPreferenceActivity.java
+++ b/notepad-app/src/org/routine_work/notepad/prefs/NotepadPreferenceActivity.java
@@ -120,12 +120,12 @@ public class NotepadPreferenceActivity extends PreferenceActivity
 			if (receiveTextEnabled)
 			{
 				newState = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-				Log.d(LOG_TAG, "Update ReceiveTextActivity component : PackageManager.COMPONENT_ENABLED_STATE_ENABLED");
+				Log.d(LOG_TAG, "Enable ReceiveTextActivity component");
 			}
 			else
 			{
 				newState = PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
-				Log.d(LOG_TAG, "Update ReceiveTextActivity component : PackageManager.COMPONENT_ENABLED_STATE_DISABLED");
+				Log.d(LOG_TAG, "Disable ReceiveTextActivity component");
 			}
 
 			PackageManager packageManager = getPackageManager();