Initial commit with appcompat

OsmAnd/res/layout/expandable_list.xml

@@ -24,6 +24,6 @@
         android:layout_marginRight="0dp"
         android:layout_marginTop="0dp"
         android:layout_weight="1"
-        android:groupIndicator="@android:color/transparent"></ExpandableListView>
+        android:groupIndicator="@android:color/transparent"/>
 
 </LinearLayout>

OsmAnd/res/layout/waypoint_reached.xml

@@ -26,7 +26,7 @@
         android:textColor="@color/distance_color"
         android:maxLines="2"
         android:textStyle="bold"
-        android:textSize="15sp"></TextView>
+        android:textSize="15sp"/>
 
     <TextView
         android:id="@+id/waypoint_text"
@@ -47,7 +47,7 @@
         android:layout_gravity="center_vertical"
         android:visibility="gone"
         android:focusable="false"
-        style="@style/Widget.Sherlock.ActionButton"
+        style="@style/Widget.AppCompat.ActionButton"
         android:src="@drawable/ic_action_core_overflow_dark" />
 
     <ImageButton
@@ -57,7 +57,7 @@
         android:contentDescription="@string/close"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="4dp"
-        style="@style/Widget.Sherlock.ActionButton"
+        style="@style/Widget.AppCompat.ActionButton"
         android:focusable="false"
         android:src="@drawable/ic_action_gremove_dark" />
 

OsmAnd/res/values/styles.xml

@@ -53,11 +53,11 @@
     </style>
     
     
-    <style name="OsmandLightTheme" parent="Theme.Sherlock.Light">
+    <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
         <item name="expandable_category_color">@color/group_background</item>
         <item name="reset_image">@drawable/ic_action_delete_light</item> <!--  @drawable/a_1_navigation_cancel_light -->
     </style>
-    <style name="OsmandLightDarkActionBarTheme" parent="Theme.Sherlock.Light.DarkActionBar">
+    <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!--<item name="android:windowContentOverlay">@null</item>
         <item name="android:windowBackground">@color/activity_background</item>
         <item name="android:colorBackground">@color/activity_background</item>
@@ -73,12 +73,12 @@
         <item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>
     </style>
-    <style name="OsmandDarkTheme" parent="Theme.Sherlock">
+    <style name="OsmandDarkTheme" parent="Theme.AppCompat">
         <item name="reset_image">@drawable/ic_action_delete_dark</item> <!--  @drawable/a_1_navigation_cancel_dark -->
         <item name="expandable_category_color">?android:attr/colorBackground</item>
      </style>
      
-    <style name="Widget.Styled.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
+    <style name="Widget.Styled.ActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
         <item name="background">@drawable/bg_striped</item>
         <item name="android:background">@drawable/bg_striped</item>
     </style>

OsmAnd/src/net/osmand/access/AccessibleActivity.java

@@ -1,16 +1,15 @@
 package net.osmand.access;
 
+import android.support.v7.app.ActionBarActivity;
 import android.view.MotionEvent;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
 // Provide some additional accessibility means for activity view elements.
 //
 // To make use of these capabilities simply derive your activity from this class
 // and then add view elements you wish to be accessible
 // to the accessibleContent list.
 //
-public class AccessibleActivity extends SherlockFragmentActivity implements AccessibleContent.Callback {
+public class AccessibleActivity extends ActionBarActivity implements AccessibleContent.Callback {
 
     // List of accessible views. Use accessibleContent.add(element)
     // to add element to it.

OsmAnd/src/net/osmand/plus/OsmandApplication.java

@@ -12,6 +12,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibilityPlugin;
@@ -75,10 +77,6 @@ import android.widget.Toast;
 import btools.routingapp.BRouterServiceConnection;
 import btools.routingapp.IBRouterService;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockActivity;
-import com.actionbarsherlock.app.SherlockExpandableListActivity;
-import com.actionbarsherlock.app.SherlockListActivity;
 
 
 public class OsmandApplication extends Application {
@@ -809,13 +807,14 @@ public class OsmandApplication extends Application {
 		if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_DARK_ACTIONBAR_THEME
 				&& Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 			ActionBar ab = null;
-			if (c instanceof SherlockActivity) {
-				ab = ((SherlockActivity) c).getSupportActionBar();
-			} else if (c instanceof SherlockListActivity) {
-				ab = ((SherlockListActivity) c).getSupportActionBar();
-			} else if (c instanceof SherlockExpandableListActivity) {
-				ab = ((SherlockExpandableListActivity) c).getSupportActionBar();
+			if (c instanceof ActionBarActivity) {
+				ab = ((ActionBarActivity) c).getSupportActionBar();
 			}
+//			else if (c instanceof SherlockListActivity) {
+//				ab = ((SherlockListActivity) c).getSupportActionBar();
+//			} else if (c instanceof Expandable) {
+//				ab = ((SherlockExpandableListActivity) c).getSupportActionBar();
+//			}
 			if (ab != null) {
 				BitmapDrawable bg = (BitmapDrawable) getResources().getDrawable(R.drawable.bg_striped);
 				bg.setTileModeXY(TileMode.REPEAT, TileMode.REPEAT);

OsmAnd/src/net/osmand/plus/OsmandPlugin.java

@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.preference.PreferenceScreen;
+import android.support.v4.app.Fragment;
 import net.osmand.IProgress;
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
@@ -26,7 +27,6 @@ import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.views.OsmandMapTileView;
 import org.apache.commons.logging.Log;
 
-import com.actionbarsherlock.app.SherlockFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -150,11 +150,11 @@ public abstract class OsmandPlugin {
 	
 	public void updateLocation(Location location) {}
 	
-	public void contextMenuLocalIndexes(Activity activity, SherlockFragment fragment, Object info, ContextMenuAdapter adapter) {};
+	public void contextMenuLocalIndexes(Activity activity, Fragment fragment, Object info, ContextMenuAdapter adapter) {};
 	
 	public void updateLocalIndexDescription(LocalIndexInfo info) {}
 	
-	public void optionsMenuLocalIndexes(Activity activity, SherlockFragment fragment, ContextMenuAdapter optionsMenuAdapter) {};
+	public void optionsMenuLocalIndexes(Activity activity, Fragment fragment, ContextMenuAdapter optionsMenuAdapter) {};
 	
 	public List<String> indexingFiles(IProgress progress) {	return null;}
 	
@@ -285,14 +285,14 @@ public abstract class OsmandPlugin {
 		}		
 	}
 	
-	public static void onContextMenuActivity(Activity activity, SherlockFragment fragment, Object info, ContextMenuAdapter adapter) {
+	public static void onContextMenuActivity(Activity activity, Fragment fragment, Object info, ContextMenuAdapter adapter) {
 		for (OsmandPlugin plugin : activePlugins) {
 			plugin.contextMenuLocalIndexes(activity, fragment, info, adapter);
 		}
 	}
 	
 	
-	public static void onOptionsMenuActivity(Activity activity, SherlockFragment fragment, ContextMenuAdapter optionsMenuAdapter) {
+	public static void onOptionsMenuActivity(Activity activity, Fragment fragment, ContextMenuAdapter optionsMenuAdapter) {
 		for (OsmandPlugin plugin : activePlugins) {
 			plugin.optionsMenuLocalIndexes(activity, fragment, optionsMenuAdapter);
 		}

OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java

@@ -7,6 +7,8 @@ import java.io.File;
 import java.util.ArrayList;
 
 import android.content.Intent;
+import android.support.v7.app.ActionBarActivity;
+import android.view.Window;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
@@ -26,13 +28,10 @@ import android.widget.TabHost.TabSpec;
 import android.widget.TabWidget;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Window;
-
 /**
  *
  */
-public class FavouritesActivity extends SherlockFragmentActivity {
+public class FavouritesActivity extends ActionBarActivity {
 
 	private static final String FAVOURITES_INFO = "FAVOURITES_INFO";
 	private static final String TRACKS = "TRACKS";

OsmAnd/src/net/osmand/plus/activities/FavouritesListActivity.java

@@ -1,11 +1,11 @@
 package net.osmand.plus.activities;
 
+import android.support.v7.app.ActionBarActivity;
 import net.osmand.plus.OsmandApplication;
 import android.os.Bundle;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 
-public class FavouritesListActivity extends SherlockFragmentActivity {
+public class FavouritesListActivity extends ActionBarActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java

@@ -5,6 +5,12 @@ import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
+import android.support.v4.app.Fragment;
+import android.support.v4.view.MenuItemCompat;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
 import net.osmand.PlatformUtil;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
@@ -30,15 +36,10 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
 import com.jwetherell.openmap.common.LatLonPoint;
 import com.jwetherell.openmap.common.UTMPoint;
 
-public class NavigatePointFragment extends SherlockFragment implements SearchActivityChild {
+public class NavigatePointFragment extends Fragment implements SearchActivityChild {
 	int currentFormat = Location.FORMAT_DEGREES;
 	
 	public static final String SEARCH_LAT = SearchActivity.SEARCH_LAT;
@@ -64,7 +65,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 		
 		LatLon loc = null;
 		OsmandApplication app = (OsmandApplication) getActivity().getApplication();
-		Intent intent = getSherlockActivity().getIntent();
+		Intent intent = getActivity().getIntent();
 		if(intent != null){
 			double lat = intent.getDoubleExtra(SEARCH_LAT, 0);
 			double lon = intent.getDoubleExtra(SEARCH_LON, 0);
@@ -110,53 +111,55 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		OsmandApplication app = (OsmandApplication) getActivity().getApplication();
 		boolean light = app.getSettings().isLightActionBar();
-		com.actionbarsherlock.view.MenuItem menuItem = menu.add(0, NAVIGATE_TO, 0, R.string.context_menu_item_directions_to).setShowAsActionFlags(
-				MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+		MenuItem menuItem = menu.add(0, NAVIGATE_TO, 0, R.string.context_menu_item_directions_to);
+		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gdirections_light : R.drawable.ic_action_gdirections_dark);
-		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+		menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
-			public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+			public boolean onMenuItemClick(MenuItem item) {
 				select(NAVIGATE_TO);
 				return true;
 			}
 		});
 		TargetPointsHelper targets = app.getTargetPointsHelper();
 		if (targets.getPointToNavigate() != null) {
-			menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_intermediate_point).setShowAsActionFlags(
-					MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+			menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_intermediate_point);
+			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flage_light
 					: R.drawable.ic_action_flage_dark);
 		} else {
-			menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_destination_point).setShowAsActionFlags(
-					MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+			menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_destination_point);
+			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flag_light
 					: R.drawable.ic_action_flag_dark);
 		}
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					select(ADD_WAYPOINT);
 					return true;
 				}
 			});
 		//}
-		menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.search_shown_on_map).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+		menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.search_shown_on_map);
+		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		menuItem = menuItem.setIcon(light ? R.drawable.ic_action_marker_light : R.drawable.ic_action_marker_dark);
 
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
-			public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+			public boolean onMenuItemClick(MenuItem item) {
 				select(SHOW_ON_MAP);
 				return true;
 			}
 		});
 		
-		menuItem = menu.add(0, ADD_TO_FAVORITE, 0, R.string.add_to_favourite).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+		menuItem = menu.add(0, ADD_TO_FAVORITE, 0, R.string.add_to_favourite);
+		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		menuItem = menuItem.setIcon(light ? R.drawable.ic_action_fav_light : R.drawable.ic_action_fav_dark);
 
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
-			public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+			public boolean onMenuItemClick(MenuItem item) {
 				select(ADD_TO_FAVORITE);
 				return true;
 			}
@@ -226,7 +229,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 		currentFormat = Location.FORMAT_DEGREES;
 		showCurrentFormat(new LatLon(latitude, longitude));
 		final Spinner format = ((Spinner)view.findViewById(R.id.Format));
-		ArrayAdapter<String> adapter = new ArrayAdapter<String>(getSherlockActivity(), android.R.layout.simple_spinner_item, new String[] {
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_spinner_item, new String[] {
 				getString(R.string.navigate_point_format_D),
 				getString(R.string.navigate_point_format_DM),
 				getString(R.string.navigate_point_format_DMS),

OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java

@@ -1,5 +1,11 @@
 package net.osmand.plus.activities;
 
+import android.app.ExpandableListActivity;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.ExpandableListView;
 import net.osmand.plus.OsmandApplication;
 import android.app.ActionBar;
 import android.graphics.Shader.TileMode;
@@ -8,13 +14,9 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.View;
 
-import com.actionbarsherlock.app.SherlockExpandableListActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
 
 public abstract class OsmandExpandableListActivity extends
-		SherlockExpandableListActivity {
+		ActionBarActivity {
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -31,7 +33,7 @@ public abstract class OsmandExpandableListActivity extends
 	
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		int itemId = item.getItemId();
 		switch (itemId) {
 		case android.R.id.home:
@@ -48,12 +50,13 @@ public abstract class OsmandExpandableListActivity extends
 		if (r != 0) {
 			menuItem.setIcon(r);
 		}
-		menuItem.setShowAsActionFlags(menuItemType).setOnMenuItemClickListener(new OnMenuItemClickListener() {
+		menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
-			public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+			public boolean onMenuItemClick(MenuItem item) {
 				return onOptionsItemSelected(item);
 			}
 		});
+		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
 		return menuItem;
 	}
 	
@@ -68,7 +71,19 @@ public abstract class OsmandExpandableListActivity extends
 		}
 	}
 	
-	
+
+	public void setListAdapter(OsmandBaseExpandableListAdapter adapter){
+		((ExpandableListView)findViewById(android.R.id.list)).setAdapter(adapter);
+	}
+
+	public ExpandableListView getExpandableListView() {
+		return (ExpandableListView)findViewById(android.R.id.list);
+	}
+
+	public void setOnChildClickListener(ExpandableListView.OnChildClickListener childClickListener){
+		((ExpandableListView)findViewById(android.R.id.list)).setOnChildClickListener(childClickListener);
+	}
+
 	public boolean isLightActionBar() {
 		return ((OsmandApplication) getApplication()).getSettings().isLightActionBar();
 	}

OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java

@@ -1,5 +1,10 @@
 package net.osmand.plus.activities;
 
+import android.support.v4.app.Fragment;
+import android.support.v4.view.MenuCompat;
+import android.support.v4.view.MenuItemCompat;
+import android.view.Menu;
+import android.view.MenuItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import android.graphics.Shader.TileMode;
@@ -11,12 +16,7 @@ import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
 
-import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
-
-public abstract class OsmandExpandableListFragment extends SherlockFragment implements OnChildClickListener {
+public abstract class OsmandExpandableListFragment extends Fragment implements OnChildClickListener {
 	
 	
 	private ExpandableListView listView;
@@ -75,12 +75,13 @@ public abstract class OsmandExpandableListFragment extends SherlockFragment impl
 		if (r != 0) {
 			menuItem.setIcon(r);
 		}
-		menuItem.setShowAsActionFlags(menuItemType).setOnMenuItemClickListener(new OnMenuItemClickListener() {
+		menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
-			public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+			public boolean onMenuItemClick(MenuItem item) {
 				return onOptionsItemSelected(item);
 			}
 		});
+		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
 		return menuItem;
 	}
 	

OsmAnd/src/net/osmand/plus/activities/PrintDialogActivity.java

@@ -3,6 +3,8 @@
  */
 package net.osmand.plus.activities;
 
+import android.support.v7.app.ActionBarActivity;
+import android.view.Window;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import android.annotation.SuppressLint;
@@ -20,13 +22,11 @@ import android.print.PrintManager;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Window;
 
 /**
  *
  */
-public class PrintDialogActivity extends SherlockFragmentActivity {
+public class PrintDialogActivity extends ActionBarActivity {
 	private WebView webView;
 	PrintJobId printJobId = null;
 

OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java

@@ -33,8 +33,6 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
-import com.actionbarsherlock.app.SherlockPreferenceActivity;
 
 public abstract class SettingsBaseActivity extends SherlockPreferenceActivity implements OnPreferenceChangeListener, OnPreferenceClickListener {
 

OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java

@@ -8,6 +8,7 @@ import java.util.Formatter;
 import java.util.List;
 import java.util.Locale;
 
+import android.support.v7.app.ActionBarActivity;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmAndLocationProvider;
@@ -40,11 +41,7 @@ import android.widget.TabHost.TabSpec;
 import android.widget.TabWidget;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
-
-public class SearchActivity extends SherlockFragmentActivity implements OsmAndLocationListener {
+public class SearchActivity extends ActionBarActivity implements OsmAndLocationListener {
 	private static final String SEARCH_HISTORY = "Search_History";
 	private static final String SEARCH_FAVORITES = "Search_Favorites";
 	private static final String SEARCH_TRANSPORT = "Search_Transport";

OsmAnd/src/net/osmand/plus/activities/search/SearchAddressActivity.java

@@ -1,12 +1,12 @@
 package net.osmand.plus.activities.search;
 
+import android.support.v7.app.ActionBarActivity;
 import net.osmand.plus.OsmandApplication;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 
-public class SearchAddressActivity extends SherlockFragmentActivity {
+public class SearchAddressActivity extends ActionBarActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java

@@ -2,6 +2,11 @@ package net.osmand.plus.activities.search;
 
 import java.text.MessageFormat;
 
+import android.support.v4.app.Fragment;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
 import net.osmand.access.AccessibleToast;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
@@ -24,13 +29,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
-
-public class SearchAddressFragment extends SherlockFragment {
+public class SearchAddressFragment extends Fragment {
 
 	public static final String SELECT_ADDRESS_POINT_INTENT_KEY = "SELECT_ADDRESS_POINT_INTENT_KEY";
 	public static final int SELECT_ADDRESS_POINT_RESULT_OK = 1;	
@@ -80,23 +79,23 @@ public class SearchAddressFragment extends SherlockFragment {
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		boolean light = ((OsmandApplication) getApplication()).getSettings().isLightActionBar();
 		if(getActivity() instanceof SearchAddressActivity) {
-			com.actionbarsherlock.view.MenuItem menuItem = menu.add(0, SELECT_POINT, 0, "").setShowAsActionFlags(
+			MenuItem menuItem = menu.add(0, SELECT_POINT, 0, "").setShowAsActionFlags(
 					MenuItem.SHOW_AS_ACTION_ALWAYS );
 			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_ok_light : R.drawable.ic_action_ok_dark);
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					select(SELECT_POINT);
 					return true;
 				}
 			});
 		} else {
-			com.actionbarsherlock.view.MenuItem menuItem = menu.add(0, NAVIGATE_TO, 0, R.string.context_menu_item_directions_to).setShowAsActionFlags(
+			MenuItem menuItem = menu.add(0, NAVIGATE_TO, 0, R.string.context_menu_item_directions_to).setShowAsActionFlags(
 					MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gdirections_light : R.drawable.ic_action_gdirections_dark);
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					select(NAVIGATE_TO);
 					return true;
 				}
@@ -113,7 +112,7 @@ public class SearchAddressFragment extends SherlockFragment {
 			}
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					select(ADD_WAYPOINT);
 					return true;
 				}
@@ -123,7 +122,7 @@ public class SearchAddressFragment extends SherlockFragment {
 
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					select(SHOW_ON_MAP);
 					return true;
 				}
@@ -134,7 +133,7 @@ public class SearchAddressFragment extends SherlockFragment {
 
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					select(ADD_TO_FAVORITE);
 					return true;
 				}
@@ -143,7 +142,7 @@ public class SearchAddressFragment extends SherlockFragment {
 			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gnext_light : R.drawable.ic_action_gnext_dark);
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					((SearchActivity) getActivity()).startSearchAddressOnline();
 					return true;
 				}

OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java

@@ -8,6 +8,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import android.support.v4.app.Fragment;
+import android.support.v4.view.MenuItemCompat;
+import android.view.*;
+import android.view.MenuItem.OnMenuItemClickListener;
 import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibleToast;
 import net.osmand.data.LatLon;
@@ -31,9 +35,6 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Xml;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -44,13 +45,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
-
-public class SearchAddressOnlineFragment extends SherlockFragment implements SearchActivityChild, OnItemClickListener {
+public class SearchAddressOnlineFragment extends Fragment implements SearchActivityChild, OnItemClickListener {
 	
 	private LatLon location;
 	private final static Log log = PlatformUtil.getLog(SearchAddressOnlineFragment.class);
@@ -65,24 +60,25 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		MenuItem menuItem;
 		boolean light = ((OsmandApplication) getActivity().getApplication()).getSettings().isLightActionBar();
-		menuItem = menu.add(0, 1, 0, R.string.search_offline_clear_search).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT );
+		menuItem = menu.add(0, 1, 0, R.string.search_offline_clear_search);
+		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gremove_light : R.drawable.ic_action_gremove_dark);
 
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
-			public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+			public boolean onMenuItemClick(MenuItem item) {
 				searchText.setText("");
 				adapter.clear();
 				return true;
 			}
 		});
 		if (getActivity() instanceof SearchActivity) {
-			menuItem = menu.add(0, 0, 0, R.string.search_offline_address).setShowAsActionFlags(
-					MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+			menuItem = menu.add(0, 0, 0, R.string.search_offline_address);
+			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gnext_light : R.drawable.ic_action_gnext_dark);
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
-				public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
+				public boolean onMenuItemClick(MenuItem item) {
 					((SearchActivity) getActivity()).startSearchAddressOffline();
 					return true;
 				}

OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java

@@ -7,6 +7,7 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import android.support.v4.app.Fragment;
 import net.osmand.data.LatLon;
 import net.osmand.data.TransportRoute;
 import net.osmand.data.TransportStop;
@@ -44,9 +45,8 @@ import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragment;
 
-public class SearchTransportFragment extends SherlockFragment implements SearchActivityChild, OnItemClickListener {
+public class SearchTransportFragment extends Fragment implements SearchActivityChild, OnItemClickListener {
 
 	public static final String SEARCH_LAT = SearchActivity.SEARCH_LAT;
 	public static final String SEARCH_LON = SearchActivity.SEARCH_LON;

OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesActivity.java

@@ -5,18 +5,12 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.view.*;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.app.SherlockListActivity;
-import com.actionbarsherlock.internal.widget.IcsAdapterView;
-import com.actionbarsherlock.view.MenuItem;
+import android.widget.ListView;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
@@ -29,7 +23,7 @@ import java.util.List;
 /**
  * Created by Denis on 23.12.2014.
  */
-public class DashAudioVideoNotesActivity extends SherlockListActivity {
+public class DashAudioVideoNotesActivity extends ActionBarActivity {
 	AudioVideoNotesPlugin plugin;
 	List<AudioVideoNotesPlugin.Recording> items;
 	NotesAdapter listAdapter;
@@ -48,7 +42,7 @@ public class DashAudioVideoNotesActivity extends SherlockListActivity {
 		actionBar.setIcon(android.R.color.transparent);
 		actionBar.setHomeButtonEnabled(true);
 		actionBar.setDisplayHomeAsUpEnabled(true);
-		getListView().setBackgroundColor(getResources().getColor(R.color.dashboard_background));
+		findViewById(android.R.id.list).setBackgroundColor(getResources().getColor(R.color.dashboard_background));
 	}
 
 	@Override
@@ -56,7 +50,7 @@ public class DashAudioVideoNotesActivity extends SherlockListActivity {
 		super.onResume();
 		items = new ArrayList<AudioVideoNotesPlugin.Recording>(plugin.getAllRecordings());
 		listAdapter = new NotesAdapter(items);
-		setListAdapter(listAdapter);
+		((ListView)findViewById(android.R.id.list)).setAdapter(listAdapter);
 	}
 
 	private void showContextMenu(final AudioVideoNotesPlugin.Recording recording){

OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java

@@ -1,12 +1,12 @@
 package net.osmand.plus.dashboard;
 
-import com.actionbarsherlock.app.SherlockFragment;
+import android.support.v4.app.Fragment;
 import net.osmand.plus.OsmandApplication;
 
 /**
  * Created by Denis on 24.11.2014.
  */
-public class DashBaseFragment extends SherlockFragment {
+public class DashBaseFragment extends Fragment {
 
 	public OsmandApplication getMyApplication(){
 		return (OsmandApplication) getActivity().getApplication();

OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java

@@ -13,6 +13,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
+import android.support.v7.app.ActionBarActivity;
 import android.telephony.TelephonyManager;
 import net.osmand.IndexConstants;
 import net.osmand.access.AccessibleAlertBuilder;
@@ -30,13 +31,12 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import net.osmand.plus.base.SuggestExternalDirectoryDialog;
 
 /**
  * Created by Denis on 25.11.2014.
  */
-public class BaseDownloadActivity extends SherlockFragmentActivity {
+public class BaseDownloadActivity extends ActionBarActivity {
 	protected DownloadActivityType type = DownloadActivityType.NORMAL_FILE;
 	protected OsmandSettings settings;
 	public static DownloadIndexesThread downloadListIndexThread;

OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java

@@ -13,6 +13,9 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import android.support.v7.app.ActionBar;
+import android.support.v7.view.ActionMode;
+import android.view.*;
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.access.AccessibleToast;
@@ -39,11 +42,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.StatFs;
 import android.text.method.LinkMovementMethod;
-import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -52,13 +51,6 @@ import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.view.ActionMode;
-import com.actionbarsherlock.view.ActionMode.Callback;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.SubMenu;
 
 public class LocalIndexesFragment extends OsmandExpandableListFragment {
 
@@ -603,7 +595,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 		
 		selectionMode = true;
 		selectedItems.clear();
-		actionMode = getDownloadActivity().startActionMode(new Callback() {
+		actionMode = getDownloadActivity().startSupportActionMode(new ActionMode.Callback() {
 
 			@Override
 			public boolean onCreateActionMode(ActionMode mode, Menu menu) {

OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java

@@ -3,6 +3,8 @@
  */
 package net.osmand.plus.osmo;
 
+import android.support.v7.view.ActionMode;
+import android.view.*;
 import gnu.trove.list.array.TIntArrayList;
 
 import java.text.Collator;
@@ -64,11 +66,6 @@ import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.CheckBox;
@@ -85,12 +82,6 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.view.ActionMode;
-import com.actionbarsherlock.view.ActionMode.Callback;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.Window;
-
 /**
  *
  */
@@ -134,8 +125,8 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 	public void onCreate(Bundle icicle) {
 		// This has to be called before setContentView and you must use the
 		// class in com.actionbarsherlock.view and NOT android.view
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-		getSherlock().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
+		supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+		//getSherlock().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
 		super.onCreate(icicle);
 		app = (OsmandApplication) getApplication();
 		osMoPlugin = OsmandPlugin.getEnabledPlugin(OsMoPlugin.class);
@@ -166,6 +157,18 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		white.setAntiAlias(true);
 		
 		updateStatus();
+		setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+			@Override
+			public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
+				OsMoDevice model = adapter.getChild(groupPosition, childPosition);
+				if (model != selectedObject) {
+					enterSelectionMode(model);
+				} else {
+					quitSelectionMode();
+				}
+				return true;
+			}
+		});
 	}
 
 	private void setupHeader() {
@@ -404,21 +407,21 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		if(!checkOperationIsNotRunning()) {
 			return;
 		}
-		actionMode = startActionMode(new Callback() {
+		actionMode = startSupportActionMode(new ActionMode.Callback() {
 			private OsMoDevice device;
 			private OsMoGroup group;
 
 			@Override
 			public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 				selectedObject = o;
-				device =  (OsMoDevice) (o instanceof OsMoDevice ?o : null); 
-				group =  (OsMoGroup) (o instanceof OsMoGroup ?o : null);
+				device = (OsMoDevice) (o instanceof OsMoDevice ? o : null);
+				group = (OsMoGroup) (o instanceof OsMoGroup ? o : null);
 				MenuItem mi = null;
-				if(device != null) {
+				if (device != null) {
 					mi = createMenuItem(menu, ON_OFF_ACTION_ID, R.string.default_buttons_ok, 0, 0,
 							MenuItem.SHOW_AS_ACTION_ALWAYS);
 				}
-				if(device != null && device.getLastLocation() != null) {
+				if (device != null && device.getLastLocation() != null) {
 					createMenuItem(menu, SHOW_ON_MAP_ID, R.string.show_poi_on_map, R.drawable.ic_action_marker_light, R.drawable.ic_action_marker_dark,
 							MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				}
@@ -426,28 +429,28 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 						// there is a bug in Android 4.2 layout
 						device != null && device.getLastLocation() != null ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				///
-				if(device != null) {
+				if (device != null) {
 					createMenuItem(menu, SETTINGS_DEV_ID, R.string.settings, R.drawable.ic_action_settings_light, R.drawable.ic_action_settings_dark,
 							// there is a bug in Android 4.2 layout
 							device.getLastLocation() != null ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				}
-				if(device != null && device.getLastLocation() != null) {
+				if (device != null && device.getLastLocation() != null) {
 					MenuItem menuItem = createMenuItem(menu, TRACK_DEV_ID, R.string.osmo_set_moving_target, R.drawable.ic_action_flage_light, R.drawable.ic_action_flage_dark,
 							// there is a bug in Android 4.2 layout
 							device.getLastLocation() != null ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_IF_ROOM);
 					menuItem.setTitleCondensed(getString(R.string.osmo_follow));
 				}
-				if(group != null) {
+				if (group != null) {
 					createMenuItem(menu, GROUP_INFO, R.string.osmo_group_info, R.drawable.ic_action_info_light, R.drawable.ic_action_info_dark,
-							MenuItem.SHOW_AS_ACTION_IF_ROOM);	
+							MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				}
 				if ((group != null && !group.isMainGroup()) || (device != null && device.getGroup().isMainGroup())) {
 					createMenuItem(menu, DELETE_ACTION_ID, R.string.default_buttons_delete,
 							R.drawable.ic_action_delete_light, R.drawable.ic_action_delete_dark,
 							MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				}
-				
-				
+
+
 				if (mi != null) {
 					final LayoutInflater inflater = LayoutInflater.from(OsMoGroupsActivity.this);
 					View view = inflater.inflate(R.layout.check_item_rel, null);
@@ -478,22 +481,22 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 
 			@Override
 			public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-				if(item.getItemId() == TRACK_DEV_ID) {
-					if(device != null) {
+				if (item.getItemId() == TRACK_DEV_ID) {
+					if (device != null) {
 						OsMoPositionLayer.setFollowDestination(device);
 						MapActivity.launchMapActivityMoveToTop(OsMoGroupsActivity.this);
 					}
-				} else if(item.getItemId() == SETTINGS_DEV_ID) {
+				} else if (item.getItemId() == SETTINGS_DEV_ID) {
 					showSettingsDialog(device);
-				} else if(item.getItemId() == DELETE_ACTION_ID ) {
+				} else if (item.getItemId() == DELETE_ACTION_ID) {
 					Builder bld = new AlertDialog.Builder(OsMoGroupsActivity.this);
-					String name = (selectedObject instanceof OsMoDevice)? ((OsMoDevice) selectedObject).getVisibleName() :
-						((OsMoGroup) selectedObject).getVisibleName(OsMoGroupsActivity.this);
+					String name = (selectedObject instanceof OsMoDevice) ? ((OsMoDevice) selectedObject).getVisibleName() :
+							((OsMoGroup) selectedObject).getVisibleName(OsMoGroupsActivity.this);
 					bld.setTitle(getString(
-							selectedObject instanceof OsMoDevice? R.string.delete_confirmation_msg :
-								R.string.osmo_leave_confirmation_msg, name));
-					bld.setPositiveButton(R.string .default_buttons_yes, new DialogInterface.OnClickListener() {
-						
+							selectedObject instanceof OsMoDevice ? R.string.delete_confirmation_msg :
+									R.string.osmo_leave_confirmation_msg, name));
+					bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
 							Object obj = selectedObject;
@@ -503,26 +506,26 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 					});
 					bld.setNegativeButton(R.string.default_buttons_no, null);
 					bld.show();
-				} else if(item.getItemId() == GROUP_INFO) {
+				} else if (item.getItemId() == GROUP_INFO) {
 					showGroupInfo(group);
-				} else if(item.getItemId() == SHARE_ID) {
-					if(device != null) {
+				} else if (item.getItemId() == SHARE_ID) {
+					if (device != null) {
 						shareTrackerId(device.getVisibleName(), device.getTrackerId());
 					} else {
 						shareOsMoGroup(group.getVisibleName(app), group.getGroupId());
 					}
-				} else if(item.getItemId() == SHOW_ON_MAP_ID) {
-					if(device != null) {
+				} else if (item.getItemId() == SHOW_ON_MAP_ID) {
+					if (device != null) {
 						Location location = device.getLastLocation();
 						MapActivity.getSingleMapViewTrackingUtilities().setMapLinkedToLocation(false);
-						if (location != null){
+						if (location != null) {
 							app.getSettings().setMapLocationToShow(location.getLatitude(), location.getLongitude(), app.getSettings().getLastKnownMapZoom(),
 									null, device.getVisibleName(), device);
 						}
 						OsMoPositionLayer.setFollowTrackerId(device);
 						MapActivity.launchMapActivityMoveToTop(OsMoGroupsActivity.this);
 					}
-				} else if(item.getItemId() == ON_OFF_ACTION_ID) {
+				} else if (item.getItemId() == ON_OFF_ACTION_ID) {
 					CompoundButton bt = ((CompoundButton) item.getActionView().findViewById(R.id.check_item));
 					onOffAction(bt);
 				}
@@ -530,22 +533,22 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 			}
 
 			private void onOffAction(CompoundButton bt) {
-				if((selectedObject instanceof OsMoDevice)) {
+				if ((selectedObject instanceof OsMoDevice)) {
 					OsMoDevice d = (OsMoDevice) selectedObject;
-					if(bt.isChecked()) {
+					if (bt.isChecked()) {
 						osMoPlugin.getGroups().connectDevice(d);
 					} else {
 						osMoPlugin.getGroups().disconnectDevice(d);
 					}
 				} else {
 					OsMoGroup g = (OsMoGroup) selectedObject;
-					if(bt.isChecked()) {
+					if (bt.isChecked()) {
 						String operation = osMoPlugin.getGroups().connectGroup(g);
 						startLongRunningOperation(operation);
 					} else {
 						String operation = osMoPlugin.getGroups().disconnectGroup(g);
 						startLongRunningOperation(operation);
-					}	
+					}
 				}
 				quitSelectionMode();
 			}
@@ -615,17 +618,6 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		
 	}
 
-	@Override
-	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
-		OsMoDevice model = adapter.getChild(groupPosition, childPosition);
-		if (model != selectedObject) {
-			enterSelectionMode(model);
-		} else {
-			quitSelectionMode();
-		}
-		return true;
-	}
-
 	private void quitSelectionMode() {
 		selectedObject = null;
 		actionMode.finish();
@@ -633,7 +625,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == CONNECT_TO) {
 			connectToDevice();
 			return true;
@@ -952,7 +944,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 	}
 
 	@Override
-	public boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu) {
+	public boolean onCreateOptionsMenu(Menu menu) {
 		createMenuItem(menu, CONNECT_TO, R.string.osmo_connect, 
 				0, 0,/*R.drawable.ic_action_marker_light,*/
 				MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);

OsmAnd/src/net/osmand/plus/sherpafy/SherpafyHtmlFragment.java

@@ -1,14 +1,15 @@
 package net.osmand.plus.sherpafy;
 
+import android.support.v4.app.Fragment;
+import android.view.MenuItem;
 import net.osmand.plus.OsmandApplication;
 import android.os.Bundle;
 import android.view.View;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
-import com.actionbarsherlock.app.SherlockFragment;
 
-public class SherpafyHtmlFragment extends SherlockFragment {
+public class SherpafyHtmlFragment extends Fragment {
 	public static final String HTML = "HTML";
 	public static final String TITLE = "TITLE";
 	OsmandApplication app;
@@ -20,7 +21,7 @@ public class SherpafyHtmlFragment extends SherlockFragment {
 
 	public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container,
 			Bundle savedInstanceState) {
-		app = (OsmandApplication) getSherlockActivity().getApplication();
+		app = (OsmandApplication) getActivity().getApplication();
 		wv = new WebView(getActivity());
 		WebSettings settings = wv.getSettings();
 		settings.setDefaultTextEncodingName("utf-8");
@@ -34,14 +35,14 @@ public class SherpafyHtmlFragment extends SherlockFragment {
 		String data = getArguments().getString(HTML);
 		String tl = getArguments().getString(TITLE);
 		if(tl != null){
-			getSherlockActivity().getSupportActionBar().setTitle(tl);
+			getActivity().getActionBar().setTitle(tl);
 		}
 		wv.loadData("<html><body>"+data+"</body></html", "text/html; charset=utf-8", "utf-8");
 	}
 	
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == android.R.id.home) {
-			((TourViewActivity) getSherlockActivity()).showSelectedItem();
+			((TourViewActivity) getActivity()).showSelectedItem();
 			return true;
 		}
 		return super.onOptionsItemSelected(item);

OsmAnd/src/net/osmand/plus/sherpafy/SherpafyLoadingFragment.java

@@ -1,5 +1,6 @@
 package net.osmand.plus.sherpafy;
 
+import android.support.v4.app.Fragment;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import android.os.Bundle;
@@ -7,9 +8,8 @@ import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragment;
 
-public class SherpafyLoadingFragment extends SherlockFragment {
+public class SherpafyLoadingFragment extends Fragment {
 	OsmandApplication app;
 	private View view;
 
@@ -19,7 +19,7 @@ public class SherpafyLoadingFragment extends SherlockFragment {
 
 	public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container,
 			Bundle savedInstanceState) {
-		app = (OsmandApplication) getSherlockActivity().getApplication();
+		app = (OsmandApplication) getActivity().getApplication();
 		view = inflater.inflate(R.layout.loading, container, false);
 		return view;
 	}
@@ -34,11 +34,11 @@ public class SherpafyLoadingFragment extends SherlockFragment {
 					public void run() {
 						((TextView) view.findViewById(R.id.ProgressMessage)).setVisibility(View.GONE);
 						view.findViewById(R.id.ProgressBar).setVisibility(View.GONE);
-						((TourViewActivity)getSherlockActivity()).showSelectedItem();			
+						((TourViewActivity)getActivity()).showSelectedItem();
 					}
 				});
 		} else {
-			((TourViewActivity)getSherlockActivity()).showSelectedItem();
+			((TourViewActivity)getActivity()).showSelectedItem();
 		}
 	}
 

OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java

@@ -3,6 +3,8 @@ package net.osmand.plus.sherpafy;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 
+import android.support.v7.app.ActionBarActivity;
+import android.view.*;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.sherpafy.TourInformation.StageFavoriteGroup;
@@ -14,20 +16,12 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.TabHost;
 import android.widget.TabHost.TabSpec;
 import android.widget.TabWidget;
 
-import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
 
-public class SherpafyStageFragment extends SherlockFragment {
+public class SherpafyStageFragment extends Fragment {
 	public static final String STAGE_PARAM = "STAGE";
 	public static final String TOUR_PARAM = "TOUR";
 	private static final int START = 8;
@@ -46,7 +40,7 @@ public class SherpafyStageFragment extends SherlockFragment {
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
-		app = (OsmandApplication) getSherlockActivity().getApplication();
+		app = (OsmandApplication) getActivity().getApplication();
 		customization = (SherpafyCustomization) app.getAppCustomization();
 
 		setHasOptionsMenu(true);
@@ -54,7 +48,7 @@ public class SherpafyStageFragment extends SherlockFragment {
 		for(TourInformation ti : customization.getTourInformations()) {
 			if(ti.getId().equals(id)) {
 				tour = ti;
-				getSherlockActivity().getSupportActionBar().setTitle(tour.getName());
+				((ActionBarActivity)getActivity()).getSupportActionBar().setTitle(tour.getName());
 				break;
 			}
 		}
@@ -63,7 +57,7 @@ public class SherpafyStageFragment extends SherlockFragment {
 			stage = tour.getStageInformation().get(k);
 		}
 		if (stage != null){
-			getSherlockActivity().getSupportActionBar().setTitle(stage.getName());
+			((ActionBarActivity)getActivity()).getSupportActionBar().setTitle(stage.getName());
 		}
 	}
 	
@@ -81,17 +75,17 @@ public class SherpafyStageFragment extends SherlockFragment {
 			if(customization.isStageVisited(stage.getOrder())) {
 				text = R.string.stage_is_completed;
 			}
-			((TourViewActivity) getSherlockActivity()).createMenuItem(menu, START, text, 0, 0, MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT,
-					new OnMenuItemClickListener() {
+			((TourViewActivity) getActivity()).createMenuItem(menu, START, text, 0, 0, MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT,
+					new MenuItem.OnMenuItemClickListener() {
 						@Override
 						public boolean onMenuItemClick(MenuItem item) {
 							return onOptionsItemSelected(item);
 						}
 					});
 			if (customization.isStageVisited(stage.getOrder()) && customization.getNextAvailableStage(tour) != null) {
-				((TourViewActivity) getSherlockActivity()).createMenuItem(menu, NEXT_STAGE, R.string.next_stage, 0, 0,
+				((TourViewActivity) getActivity()).createMenuItem(menu, NEXT_STAGE, R.string.next_stage, 0, 0,
 						MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT,
-						new OnMenuItemClickListener() {
+						new MenuItem.OnMenuItemClickListener() {
 							@Override
 							public boolean onMenuItemClick(MenuItem item) {
 								return onOptionsItemSelected(item);
@@ -104,13 +98,13 @@ public class SherpafyStageFragment extends SherlockFragment {
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == android.R.id.home) {
-			((TourViewActivity) getSherlockActivity()).selectMenu(tour);
+			((TourViewActivity) getActivity()).selectMenu(tour);
 			return true;
 		} else if(item.getItemId() == START) {
-			((TourViewActivity) getSherlockActivity()).startStage(stage);
+			((TourViewActivity) getActivity()).startStage(stage);
 			return true;
 		} else if(item.getItemId() == NEXT_STAGE) {
-			((TourViewActivity) getSherlockActivity()).selectMenu(customization.getNextAvailableStage(tour));
+			((TourViewActivity) getActivity()).selectMenu(customization.getNextAvailableStage(tour));
 			return true;
 		}
 		return super.onOptionsItemSelected(item);
@@ -125,7 +119,7 @@ public class SherpafyStageFragment extends SherlockFragment {
 
 		ViewPager mViewPager = (ViewPager) view.findViewById(R.id.pager);
 		
-		mTabsAdapter = new TabsAdapter(getChildFragmentManager(), getSherlockActivity(), tabHost, mViewPager, stage);
+		mTabsAdapter = new TabsAdapter(getChildFragmentManager(), getActivity(), tabHost, mViewPager, stage);
 		if (stage != null) {
 			mTabsAdapter.addTab(tabHost.newTabSpec("INFO").setIndicator(getString(R.string.sherpafy_stage_tab_info)),
 					SherpafyStageInfoFragment.class);
@@ -169,7 +163,7 @@ public class SherpafyStageFragment extends SherlockFragment {
 	}
 
 	public void onBackPressed() {
-		((TourViewActivity) getSherlockActivity()).selectMenu(tour);
+		((TourViewActivity) getActivity()).selectMenu(tour);
 	}
 
 

OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java

@@ -2,6 +2,9 @@ package net.osmand.plus.sherpafy;
 
 import java.util.WeakHashMap;
 
+import android.support.v7.app.ActionBarActivity;
+import android.view.Menu;
+import android.view.MenuItem;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -27,14 +30,9 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
-
 /**
  */
-public class TourViewActivity extends SherlockFragmentActivity {
+public class TourViewActivity extends ActionBarActivity {
 
 	private enum viewState {
 		STATE_LOADING,
@@ -226,7 +224,7 @@ public class TourViewActivity extends SherlockFragmentActivity {
 	}
 
 	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType,
-								   final OnMenuItemClickListener listener) {
+								   final MenuItem.OnMenuItemClickListener listener) {
 		// int r = getMyApplication().getSettings().isLightActionBar() ? iconLight : iconDark;
 		int r = iconLight;
 		MenuItem menuItem = m.add(0, id, 0, titleRes);
@@ -241,7 +239,7 @@ public class TourViewActivity extends SherlockFragmentActivity {
 		return (OsmandApplication) getApplication();
 	}
 
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == android.R.id.home && mDrawerToggle.isDrawerIndicatorEnabled()) {
 			if (mDrawerLayout.isDrawerOpen(mDrawerList)) {
 				mDrawerLayout.closeDrawer(mDrawerList);

appcompat/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

appcompat/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android-support-v7-appcompat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

appcompat/AndroidManifest.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.support.v7.appcompat">
+    <uses-sdk android:minSdkVersion="7"/>
+    <application />
+</manifest>

appcompat/README.txt

@@ -0,0 +1,10 @@
+Library Project including compatibility ActionBar.
+
+This can be used by an Android project to provide
+access to ActionBar on applications running on API 7+.
+
+There is technically no source, but the src folder is necessary
+to ensure that the build system works.  The content is actually
+located in libs/android-support-v7-appcompat.jar.
+The accompanying resources must also be included in the application.
+

appcompat/gen/android/support/v7/appcompat/BuildConfig.java

@@ -0,0 +1,8 @@
+/*___Generated_by_IDEA___*/
+
+package android.support.v7.appcompat;
+
+/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
+public final class BuildConfig {
+  public final static boolean DEBUG = Boolean.parseBoolean(null);
+}

appcompat/gen/android/support/v7/appcompat/Manifest.java

@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package android.support.v7.appcompat;
+
+/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
+public final class Manifest {
+}

appcompat/gen/android/support/v7/appcompat/R.java

@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package android.support.v7.appcompat;
+
+/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
+public final class R {
+}

appcompat/project.properties

@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-21
+android.library=true

appcompat/res/anim/abc_fade_in.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:interpolator="@android:anim/decelerate_interpolator"
+       android:fromAlpha="0.0" android:toAlpha="1.0"
+       android:duration="@android:integer/config_mediumAnimTime" />

appcompat/res/anim/abc_fade_out.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:interpolator="@android:anim/decelerate_interpolator"
+       android:fromAlpha="1.0" android:toAlpha="0.0"
+       android:duration="@android:integer/config_mediumAnimTime" />

appcompat/res/anim/abc_slide_in_bottom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:fromYDelta="50%p" android:toYDelta="0"
+           android:duration="@android:integer/config_mediumAnimTime"/>

appcompat/res/anim/abc_slide_in_top.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:fromYDelta="-50%p" android:toYDelta="0"
+           android:duration="@android:integer/config_mediumAnimTime"/>

appcompat/res/anim/abc_slide_out_bottom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/accelerate_interpolator"
+           android:fromYDelta="0" android:toYDelta="50%p"
+           android:duration="@android:integer/config_mediumAnimTime"/>

appcompat/res/anim/abc_slide_out_top.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/accelerate_interpolator"
+           android:fromYDelta="0" android:toYDelta="-50%p"
+           android:duration="@android:integer/config_mediumAnimTime"/>

appcompat/res/color/abc_background_cache_hint_selector_material_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_accelerated="false" android:color="@color/background_material_dark" />
+    <item android:color="@android:color/transparent" />
+</selector>

appcompat/res/color/abc_background_cache_hint_selector_material_light.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_accelerated="false" android:color="@color/background_material_light" />
+    <item android:color="@android:color/transparent" />
+</selector>

appcompat/res/color/abc_primary_text_disable_only_material_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/bright_foreground_disabled_material_dark"/>
+    <item android:color="@color/bright_foreground_material_dark"/>
+</selector>

appcompat/res/color/abc_primary_text_disable_only_material_light.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/bright_foreground_disabled_material_light"/>
+    <item android:color="@color/bright_foreground_material_light"/>
+</selector>

appcompat/res/color/abc_primary_text_material_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/primary_text_disabled_material_dark"/>
+    <item android:color="@color/primary_text_default_material_dark"/>
+</selector>

appcompat/res/color/abc_primary_text_material_light.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/primary_text_disabled_material_light"/>
+    <item android:color="@color/primary_text_default_material_light"/>
+</selector>

appcompat/res/color/abc_search_url_text.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/abc_search_url_text_pressed"/>
+    <item android:state_selected="true" android:color="@color/abc_search_url_text_selected"/>
+    <item android:color="@color/abc_search_url_text_normal"/>
+</selector>

appcompat/res/color/abc_secondary_text_material_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/secondary_text_disabled_material_dark"/>
+    <item android:color="@color/secondary_text_default_material_dark"/>
+</selector>

appcompat/res/color/abc_secondary_text_material_light.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/secondary_text_disabled_material_light"/>
+    <item android:color="@color/secondary_text_default_material_light"/>
+</selector>