diff --git a/library/pom.xml b/library/pom.xml index 081bbc74b..201553e57 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -23,6 +23,12 @@ com.google.android support-v4 + + com.actionbarsherlock + actionbarsherlock + 4.4.0 + apklib + diff --git a/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java index a47114d6f..26017f341 100644 --- a/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java @@ -5,10 +5,11 @@ import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup.LayoutParams; +import com.actionbarsherlock.app.SherlockActivity; import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; -public class SlidingActivity extends Activity implements SlidingActivityBase { +public class SlidingActivity extends SherlockActivity implements SlidingActivityBase { private SlidingActivityHelper mHelper; diff --git a/pom.xml b/pom.xml index 8b0df6036..2b8592600 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,8 @@ library - library-maps-support + + @@ -66,7 +67,7 @@ com.google.android.maps maps - 17_r1 + 19_r5 com.google.android @@ -82,7 +83,7 @@ com.jayway.maven.plugins.android.generation2 android-maven-plugin - 3.6.0 + 3.9.0-rc.2