From e3d74199f6fcfc403237aa900d4920479759c6b6 Mon Sep 17 00:00:00 2001
From: jangwonseo <mklmkl2001@gmail.com>
Date: Mon, 26 Oct 2015 21:59:25 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A8=B9=EA=B1=B0=EB=A6=AC=20=EC=88=99?=
 =?UTF-8?q?=EC=86=8C=20=EB=B6=80=EB=B6=84=20=EB=92=A4=EB=A1=9C=EA=B0=80?=
 =?UTF-8?q?=EA=B8=B0,=20=ED=99=88=EB=B2=84=ED=8A=BC=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../agriculture/navigate/NavigateSearch.java  | 22 +++++++++++++++++++
 .../res/layout/activity_navigate_search.xml   |  4 ++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..fbb6828 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/vivz/slidenerd/agriculture/navigate/NavigateSearch.java b/app/src/main/java/vivz/slidenerd/agriculture/navigate/NavigateSearch.java
index 9d4b612..c6ee9f3 100644
--- a/app/src/main/java/vivz/slidenerd/agriculture/navigate/NavigateSearch.java
+++ b/app/src/main/java/vivz/slidenerd/agriculture/navigate/NavigateSearch.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 
 import vivz.slidenerd.agriculture.R;
+import vivz.slidenerd.agriculture.home.HomeActivity;
 
 public class NavigateSearch extends Activity {
     private ListView listView2;
@@ -37,6 +38,8 @@ public class NavigateSearch extends Activity {
     private TMapView mMapView = null;
     private Typeface yunGothicFont;
 
+    private Button backButton,moveToHomeButton;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -61,6 +64,25 @@ protected void onCreate(Bundle savedInstanceState) {
         final int height = displaymetrics.heightPixels;
         int width = displaymetrics.widthPixels;
 
+
+        backButton = (Button)findViewById(R.id.navigatesearchbackbutton);
+        backButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onBackPressed();
+            }
+        });
+
+        moveToHomeButton = (Button)findViewById(R.id.navigatesearch_menubutton);
+        moveToHomeButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent moveToHomeIntent = new Intent(getApplicationContext(), HomeActivity.class);
+                moveToHomeIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(moveToHomeIntent);
+            }
+        });
+
         navigateText.setOnKeyListener(new View.OnKeyListener()
         {
             public boolean onKey(View v, int keyCode, KeyEvent event)
diff --git a/app/src/main/res/layout/activity_navigate_search.xml b/app/src/main/res/layout/activity_navigate_search.xml
index b650026..15bcb15 100644
--- a/app/src/main/res/layout/activity_navigate_search.xml
+++ b/app/src/main/res/layout/activity_navigate_search.xml
@@ -18,7 +18,7 @@
             >
 
             <Button
-                android:id="@+id/back"
+                android:id="@+id/navigatesearchbackbutton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/btn_pressback"/>
@@ -37,7 +37,7 @@
             >
 
             <Button
-                android:id="@+id/myPage"
+                android:id="@+id/navigatesearch_menubutton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/btn_movetohome"/>