Commit: 5963950bfc55aa1a28830852780a02b5aabf0afd - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• Revision: 5963950bfc55aa1a28830852780a02b5aabf0afd (tree)
• Time: 2017-08-19 12:16:14
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Fixed a issue about search and back button

Change Summary

• modified: notepad-app-level-11/src/main/AndroidManifest.xml
• modified: notepad-app-level-11/src/main/java/org/routine_work/notepad/NotepadActivity.java
• modified: notepad-app/src/main/res/values-ja/strings.xml

Incremental Difference

--- a/notepad-app-level-11/src/main/AndroidManifest.xml
+++ b/notepad-app-level-11/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 	android:versionName="1.0.13"
 	android:installLocation="auto"
 >
-	<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="25" />
+	<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="25" /> <!-- Android 7.1 -->
 
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -18,6 +18,8 @@
 		android:debuggable="false"
 	>
 		<!--
+		android:resizeableActivity="true"
+		android:supportsPictureInPicture="true"
 		android:uiOptions="splitActionBarWhenNarrow"
 		-->
 

--- a/notepad-app-level-11/src/main/java/org/routine_work/notepad/NotepadActivity.java
+++ b/notepad-app-level-11/src/main/java/org/routine_work/notepad/NotepadActivity.java
@@ -227,6 +227,7 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 
 		searchView.setOnQueryTextListener(this);
 		searchView.setOnCloseListener(this);
+		Log.v(LOG_TAG, "initialQueryString => " + initialQueryString);
 		if (!TextUtils.isEmpty(initialQueryString))
 		{
 			searchView.setIconified(false);
@@ -249,8 +250,19 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 			case android.R.id.home:
 				if (searchView != null)
 				{
-					searchView.setQuery(null, false);
-					searchView.setIconified(true);
+					Log.v(LOG_TAG, "seachView.isShown() => " + searchView.isShown());
+					Log.v(LOG_TAG, "seachView.isIconified() => " + searchView.isIconified());
+					if (searchView.isShown() && !searchView.isIconified())
+					{
+						if (!TextUtils.isEmpty(searchView.getQuery()))
+						{
+							Log.v(LOG_TAG, "Clear searchView query");
+							searchView.setQuery(null, false);
+							reloadNoteList();
+						}
+						Log.v(LOG_TAG, "Iconify seachView");
+						searchView.setIconified(true);
+					}
 				}
 				closeNoteDetailFragment();
 				break;
@@ -311,13 +323,15 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 		boolean result;
 		Log.v(LOG_TAG, "Hello");
 
-		if ((keyCode == KeyEvent.KEYCODE_BACK)
-			&& searchView.isIconified() == false)
+		Log.v(LOG_TAG, "searchView.isIconified() =>  " + searchView.isIconified()); // androud 4 : true, androud 7 : false
+		Log.v(LOG_TAG, "searchView.isShown() =>  " + searchView.isShown());
+
+		if ((keyCode == KeyEvent.KEYCODE_BACK) && searchView.isShown() && !searchView.isIconified())
 		{
+			Log.v(LOG_TAG, "Close SeachView");
 			searchView.setQuery(null, false);
 			searchView.setIconified(true);
 			result = true;
-
 		}
 		else
 		{
@@ -327,8 +341,8 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 		Log.v(LOG_TAG, "Bye");
 		return result;
 	}
-
 	// BEGIN ---------- SeachView.OnCloseListener ----------
+
 	public boolean onClose()
 	{
 		Log.v(LOG_TAG, "Hello");
@@ -358,7 +372,11 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 	{
 		Log.v(LOG_TAG, "Hello");
 
-		doSeachWithQueryText(queryText);
+		doSearchWithQueryText(queryText);
+		if (TextUtils.isEmpty(queryText) == false && searchView != null && searchView.isIconified())
+		{
+			searchView.setIconified(false);
+		}
 
 		Log.v(LOG_TAG, "Bye");
 		return true;
@@ -545,7 +563,7 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 		Log.v(LOG_TAG, "Bye");
 	}
 
-	private void doSeachWithQueryText(String queryString)
+	private void doSearchWithQueryText(String queryString)
 	{
 		Log.v(LOG_TAG, "Hello");
 		Log.v(LOG_TAG, "queryString => " + queryString);

--- a/notepad-app/src/main/res/values-ja/strings.xml
+++ b/notepad-app/src/main/res/values-ja/strings.xml
@@ -37,9 +37,9 @@
 	<string name="search_note_hint">ノートを検索</string>
 	<string name="search_note_description">ノートを検索します。</string>
 	<string name="find_word_hint">単語を検索</string>
-    <plurals name="found_word_count_message">  
-        <item quantity="other">%1$d か所ありました</item>  
-    </plurals>  
+	<plurals name="found_word_count_message">
+		<item quantity="other">%1$d か所ありました</item>
+	</plurals>
 
 	<!-- activity title -->
 	<string name="note_list_title">ノート一覧</string>