From b9a1b82c474bf96d7650e6efb542dd8fb3f7d39d Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Fri, 13 Mar 2015 19:46:59 +0300
Subject: [PATCH] Direction fragment dismiss on clicks.

---
 .../maps/widget/placepage/DirectionFragment.java    | 13 ++++++++++---
 .../maps/widget/placepage/PlacePageView.java        |  2 +-
 android/src/com/mapswithme/util/UiUtils.java        | 13 -------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java b/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java
index 672e57a485..dd9bd821a2 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -16,7 +17,6 @@ import com.mapswithme.maps.bookmarks.data.MapObject;
 import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.maps.widget.ArrowView;
 import com.mapswithme.util.LocationUtils;
-import com.mapswithme.util.UiUtils;
 
 public class DirectionFragment extends DialogFragment implements LocationHelper.LocationListener
 {
@@ -44,6 +44,15 @@ public class DirectionFragment extends DialogFragment implements LocationHelper.
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
     final View root = inflater.inflate(R.layout.fragment_direction, container, false);
+    root.setOnTouchListener(new View.OnTouchListener()
+    {
+      @Override
+      public boolean onTouch(View v, MotionEvent event)
+      {
+        dismiss();
+        return false;
+      }
+    });
     initViews(root);
     return root;
   }
@@ -79,7 +88,6 @@ public class DirectionFragment extends DialogFragment implements LocationHelper.
     super.onResume();
     LocationHelper.INSTANCE.addLocationListener(this);
     refreshViews();
-    UiUtils.lockScreenOrientation(getActivity());
   }
 
   @Override
@@ -87,7 +95,6 @@ public class DirectionFragment extends DialogFragment implements LocationHelper.
   {
     super.onPause();
     LocationHelper.INSTANCE.removeLocationListener(this);
-    UiUtils.unlockScreenOrientation(getActivity());
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 527493178e..c55c34acee 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -91,7 +91,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
   private boolean mIsLatLonDms;
   private static final String PREF_USE_DMS = "use_dms";
 
-  public static enum State
+  public enum State
   {
     HIDDEN,
     PREVIEW,
diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index 3a43797384..ad3da689a3 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -345,19 +345,6 @@ public final class UiUtils
     toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
   }
 
-  public static void lockScreenOrientation(Activity activity)
-  {
-    if (activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
-      activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    else
-      activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-  }
-
-  public static void unlockScreenOrientation(FragmentActivity activity)
-  {
-    activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-  }
-
   public static void showAlertDialog(Activity activity, int titleId)
   {
     new AlertDialog.Builder(activity)