[android] Fixed review notes here https://github.com/mapsme/omim/pull/10631

added attribute, modified options screen

android/res/layout/routing_plan.xml

@@ -152,7 +152,7 @@
   </FrameLayout>
 
   <FrameLayout
-    android:background="@color/light_green"
+    android:background="?attr/drivingOptionsViewBg"
     android:id="@+id/driving_options_btn_container"
     android:visibility="gone"
     android:foreground="@drawable/shadow_top"

android/res/values/colors.xml

@@ -18,6 +18,7 @@
   <color name="base_yellow">#FFFFC30A</color>
   <color name="base_green">#FF558B2F</color>
   <color name="light_green">#2D8953</color>
+  <color name="driving_options_bg_black">#25282B</color>
 
   <color name="black_primary">#DE000000</color>   <!-- 87% black -->
   <color name="black_secondary">#8A000000</color> <!-- 54% black -->

android/res/values/themes-attrs.xml

@@ -95,6 +95,8 @@
 
     <attr name="luggageLogo" format="reference"/>
 
+    <attr name="drivingOptionsViewBg" format="color"/>
+
     <attr name="ratingButtonBackground" format="reference"/>
     <attr name="reviewButtonBackground" format="reference"/>
     <attr name="transitPedestrianBackground" format="color"/>

android/res/values/themes-base.xml

@@ -145,6 +145,7 @@
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
     <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
     <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+    <item name="drivingOptionsViewBg">@color/light_green</item>
   </style>
 
   <!-- Night theme -->
@@ -293,5 +294,6 @@
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
     <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
     <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+    <item name="drivingOptionsViewBg">@color/driving_options_bg_black</item>
   </style>
 </resources>

android/src/com/mapswithme/maps/MwmActivity.java

@@ -2073,6 +2073,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     if (mRoutingPlanInplaceController == null)
       return;
+
     mRoutingPlanInplaceController.showDrivingOptionView();
   }
 

android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java

@@ -10,8 +10,6 @@ import com.mapswithme.maps.base.BaseMwmFragmentActivity;
 
 public class DrivingOptionsActivity extends BaseMwmFragmentActivity
 {
-  public static final String BUNDLE_REQUIRE_OPTIONS_MENU = "require_options_menu";
-
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {
@@ -20,8 +18,7 @@ public class DrivingOptionsActivity extends BaseMwmFragmentActivity
 
   public static void start(@NonNull Activity activity)
   {
-    Intent intent = new Intent(activity, DrivingOptionsActivity.class)
-        .putExtra(BUNDLE_REQUIRE_OPTIONS_MENU, true);
+    Intent intent = new Intent(activity, DrivingOptionsActivity.class);
     activity.startActivityForResult(intent, MwmActivity.REQ_CODE_DRIVING_OPTIONS);
   }
 }

android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java

@@ -5,9 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
@@ -38,7 +35,6 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
   {
     View root = inflater.inflate(R.layout.fragment_driving_options, container, false);
     initViews(root);
-    setHasOptionsMenu(hasBundleOptionsMenu());
     mRoadTypes = savedInstanceState != null && savedInstanceState.containsKey(BUNDLE_ROAD_TYPES)
                  ? makeRouteTypes(savedInstanceState)
                  : RoutingOptions.getActiveRoadTypes();
@@ -75,33 +71,12 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
     return mRoadTypes.containsAll(lastActiveRoadTypes) && lastActiveRoadTypes.containsAll(mRoadTypes);
   }
 
-  private boolean hasBundleOptionsMenu()
-  {
-    Bundle arguments = getArguments();
-    if (arguments == null)
-      return false;
-
-    return arguments.getBoolean(DrivingOptionsActivity.BUNDLE_REQUIRE_OPTIONS_MENU, false);
-  }
-
   @Override
-  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
+  public boolean onBackPressed()
   {
-    inflater.inflate(R.menu.menu_done, menu);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item)
-  {
-    if (item.getItemId() == R.id.done)
-    {
-      requireActivity().setResult(areSettingsNotChanged() ? Activity.RESULT_CANCELED
-                                                          : Activity.RESULT_OK);
-      requireActivity().finish();
-      return true;
-    }
-
-    return super.onOptionsItemSelected(item);
+    requireActivity().setResult(areSettingsNotChanged() ? Activity.RESULT_CANCELED
+                                                        : Activity.RESULT_OK);
+    return super.onBackPressed();
   }
 
   private void initViews(@NonNull View root)