[android] Code refactoring.

6 files changed, 15 insertions, 18 deletions

diff --git a/android/src/com/mapswithme/maps/SearchActivity.java b/android/src/com/mapswithme/maps/SearchActivity.java
index b2ace9ce52..c9d0344e40 100644
--- a/android/src/com/mapswithme/maps/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/SearchActivity.java
@@ -397,9 +397,12 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
   {
     super.onCreate(savedInstanceState);
 
-    ActionBar actionBar = getActionBar();
-    if (actionBar != null)
-      actionBar.hide();
+    if (Utils.apiEqualOrGreaterThan(11))
+    {
+      ActionBar actionBar = getActionBar();
+      if (actionBar != null)
+        actionBar.hide();
+    }
 
     m_location = ((MWMApplication) getApplication()).getLocationService();
 
diff --git a/android/src/com/mapswithme/maps/base/MapsWithMeBaseActivity.java b/android/src/com/mapswithme/maps/base/MapsWithMeBaseActivity.java
index 0eaec7472c..add3d33913 100644
--- a/android/src/com/mapswithme/maps/base/MapsWithMeBaseActivity.java
+++ b/android/src/com/mapswithme/maps/base/MapsWithMeBaseActivity.java
@@ -11,6 +11,7 @@ import android.view.inputmethod.InputMethodManager;
 import com.mapswithme.maps.MWMApplication;
 import com.mapswithme.maps.state.SuppotedState;
 import com.mapswithme.util.Statistics;
+import com.mapswithme.util.Utils;
 
 public class MapsWithMeBaseActivity extends FragmentActivity
 {
@@ -48,7 +49,7 @@ public class MapsWithMeBaseActivity extends FragmentActivity
   {
     super.onCreate(arg0);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+    if (Utils.apiEqualOrGreaterThan(11))
     {
       // http://stackoverflow.com/questions/6867076/getactionbar-returns-null
       ActionBar bar = getActionBar();
diff --git a/android/src/com/mapswithme/maps/base/MapsWithMeBaseListActivity.java b/android/src/com/mapswithme/maps/base/MapsWithMeBaseListActivity.java
index b5130f6f85..87527dc28f 100644
--- a/android/src/com/mapswithme/maps/base/MapsWithMeBaseListActivity.java
+++ b/android/src/com/mapswithme/maps/base/MapsWithMeBaseListActivity.java
@@ -3,6 +3,7 @@ package com.mapswithme.maps.base;
 import com.mapswithme.maps.MWMApplication;
 import com.mapswithme.maps.state.SuppotedState;
 import com.mapswithme.util.Statistics;
+import com.mapswithme.util.Utils;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -52,7 +53,7 @@ public class MapsWithMeBaseListActivity extends ListActivity
   {
     super.onCreate(savedInstanceState);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+    if (Utils.apiEqualOrGreaterThan(11))
     {
       // http://stackoverflow.com/questions/6867076/getactionbar-returns-null
       ActionBar bar = getActionBar();
diff --git a/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkCategoryActivity.java b/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkCategoryActivity.java
index 5dbdc49329..30d41c3b47 100644
--- a/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkCategoryActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkCategoryActivity.java
@@ -1,7 +1,6 @@
 package com.mapswithme.maps.bookmarks;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuItem;
@@ -15,12 +14,6 @@ public abstract class AbstractBookmarkCategoryActivity extends AbstractBookmarkL
   private int mSelectedPosition;
 
   @Override
-  protected void onCreate(Bundle savedInstanceState)
-  {
-    super.onCreate(savedInstanceState);
-  }
-
-  @Override
   public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo)
   {
     if (menuInfo instanceof AdapterView.AdapterContextMenuInfo)
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
index 63d9243f01..87b9150994 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
@@ -45,8 +45,8 @@ public class BookmarkListActivity extends AbstractBookmarkListActivity
   protected void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-
     setContentView(R.layout.bookmarks_list);
+
     final int setIndex = getIntent().getIntExtra(BookmarkActivity.PIN_SET, -1);
     mEditContent = getIntent().getBooleanExtra(EDIT_CONTENT, true);
     mEditedSet = mManager.getCategoryById(setIndex);
@@ -68,7 +68,7 @@ public class BookmarkListActivity extends AbstractBookmarkListActivity
       }
     });
     registerForContextMenu(getListView());
-    
+
     adaptUiForOsVersion();
   }
 
@@ -83,7 +83,7 @@ public class BookmarkListActivity extends AbstractBookmarkListActivity
         public void onClick(View v) { onSendEMail(shareButton); }
       });
     }
-    else 
+    else
       shareButton.setVisibility(View.GONE);
   }
 
@@ -273,7 +273,7 @@ public class BookmarkListActivity extends AbstractBookmarkListActivity
                          ID_SEND_BY_EMAIL,
                          R.string.share_by_email);
 
-    menuItem.setIcon(android.R.drawable.ic_menu_share);
+    menuItem.setIcon(R.drawable.share);
     if (Utils.apiEqualOrGreaterThan(11))
       menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
index cbc18ff369..c9893c60f6 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -31,7 +30,7 @@ public class SettingsActivity extends PreferenceActivity
     super.onCreate(savedInstanceState);
 
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+    if (Utils.apiEqualOrGreaterThan(11))
     {
       // http://stackoverflow.com/questions/6867076/getactionbar-returns-null
       ActionBar bar = getActionBar();