diff --git a/library/.classpath b/library/.classpath index 603715a66..3f9691c5d 100644 --- a/library/.classpath +++ b/library/.classpath @@ -4,10 +4,5 @@ - - - - - diff --git a/library/.settings/org.eclipse.jdt.core.prefs b/library/.settings/org.eclipse.jdt.core.prefs index f77b31c2d..416f4fb69 100644 --- a/library/.settings/org.eclipse.jdt.core.prefs +++ b/library/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,11 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.5 diff --git a/library/libs/android-support-v13-docs.jar b/library/libs/android-support-v13-docs.jar deleted file mode 100644 index 2104bd347..000000000 Binary files a/library/libs/android-support-v13-docs.jar and /dev/null differ diff --git a/library/libs/android-support-v13.jar b/library/libs/android-support-v13.jar deleted file mode 100644 index df7f9fc24..000000000 Binary files a/library/libs/android-support-v13.jar and /dev/null differ diff --git a/library/project.properties b/library/project.properties index b15f1208a..a3a67b707 100644 --- a/library/project.properties +++ b/library/project.properties @@ -9,4 +9,5 @@ android.library=true # Project target. -target=Google Inc.:Google APIs:16 +target=Google Inc.:Google APIs:17 +android.library.reference.1=../../ActionBarSherlock/library diff --git a/library/src/com/slidingmenu/lib/app/SlidingActivity.java b/library/src/com/slidingmenu/lib/app/SlidingActivity.java deleted file mode 100644 index f2b570c50..000000000 --- a/library/src/com/slidingmenu/lib/app/SlidingActivity.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.slidingmenu.lib.app; - -import android.app.Activity; -import android.os.Bundle; -import android.view.KeyEvent; -import android.view.View; -import android.view.ViewGroup.LayoutParams; - -import com.slidingmenu.lib.SlidingMenu; - -public class SlidingActivity extends Activity implements SlidingActivityBase { - - private SlidingActivityHelper mHelper; - - /* (non-Javadoc) - * @see android.app.Activity#onCreate(android.os.Bundle) - */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mHelper = new SlidingActivityHelper(this); - mHelper.onCreate(savedInstanceState); - } - - /* (non-Javadoc) - * @see android.app.Activity#onPostCreate(android.os.Bundle) - */ - @Override - public void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - mHelper.onPostCreate(savedInstanceState); - } - - /* (non-Javadoc) - * @see android.app.Activity#findViewById(int) - */ - @Override - public View findViewById(int id) { - View v = super.findViewById(id); - if (v != null) - return v; - return mHelper.findViewById(id); - } - - /* (non-Javadoc) - * @see android.app.Activity#onSaveInstanceState(android.os.Bundle) - */ - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - mHelper.onSaveInstanceState(outState); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(int) - */ - @Override - public void setContentView(int id) { - setContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View) - */ - @Override - public void setContentView(View v) { - setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - @Override - public void setContentView(View v, LayoutParams params) { - super.setContentView(v, params); - mHelper.registerAboveContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) - */ - public void setBehindContentView(int id) { - setBehindContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) - */ - public void setBehindContentView(View v) { - setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - public void setBehindContentView(View v, LayoutParams params) { - mHelper.setBehindContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() - */ - public SlidingMenu getSlidingMenu() { - return mHelper.getSlidingMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() - */ - public void toggle() { - mHelper.toggle(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() - */ - public void showContent() { - mHelper.showContent(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() - */ - public void showMenu() { - mHelper.showMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() - */ - public void showSecondaryMenu() { - mHelper.showSecondaryMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) - */ - public void setSlidingActionBarEnabled(boolean b) { - mHelper.setSlidingActionBarEnabled(b); - } - - /* (non-Javadoc) - * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) - */ - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - boolean b = mHelper.onKeyUp(keyCode, event); - if (b) return b; - return super.onKeyUp(keyCode, event); - } - -} diff --git a/library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java b/library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java deleted file mode 100644 index a5eddae74..000000000 --- a/library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.slidingmenu.lib.app; - -import android.os.Bundle; -import android.support.v4.app.FragmentActivity; -import android.view.KeyEvent; -import android.view.View; -import android.view.ViewGroup.LayoutParams; - -import com.slidingmenu.lib.SlidingMenu; - -public class SlidingFragmentActivity extends FragmentActivity implements SlidingActivityBase { - - private SlidingActivityHelper mHelper; - - /* (non-Javadoc) - * @see android.support.v4.app.FragmentActivity#onCreate(android.os.Bundle) - */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mHelper = new SlidingActivityHelper(this); - mHelper.onCreate(savedInstanceState); - } - - /* (non-Javadoc) - * @see android.app.Activity#onPostCreate(android.os.Bundle) - */ - @Override - public void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - mHelper.onPostCreate(savedInstanceState); - } - - /* (non-Javadoc) - * @see android.app.Activity#findViewById(int) - */ - @Override - public View findViewById(int id) { - View v = super.findViewById(id); - if (v != null) - return v; - return mHelper.findViewById(id); - } - - /* (non-Javadoc) - * @see android.support.v4.app.FragmentActivity#onSaveInstanceState(android.os.Bundle) - */ - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - mHelper.onSaveInstanceState(outState); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(int) - */ - @Override - public void setContentView(int id) { - setContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View) - */ - @Override - public void setContentView(View v) { - setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - @Override - public void setContentView(View v, LayoutParams params) { - super.setContentView(v, params); - mHelper.registerAboveContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) - */ - public void setBehindContentView(int id) { - setBehindContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) - */ - public void setBehindContentView(View v) { - setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - public void setBehindContentView(View v, LayoutParams params) { - mHelper.setBehindContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() - */ - public SlidingMenu getSlidingMenu() { - return mHelper.getSlidingMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() - */ - public void toggle() { - mHelper.toggle(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() - */ - public void showContent() { - mHelper.showContent(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() - */ - public void showMenu() { - mHelper.showMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() - */ - public void showSecondaryMenu() { - mHelper.showSecondaryMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) - */ - public void setSlidingActionBarEnabled(boolean b) { - mHelper.setSlidingActionBarEnabled(b); - } - - /* (non-Javadoc) - * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) - */ - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - boolean b = mHelper.onKeyUp(keyCode, event); - if (b) return b; - return super.onKeyUp(keyCode, event); - } - -} diff --git a/library/src/com/slidingmenu/lib/app/SlidingListActivity.java b/library/src/com/slidingmenu/lib/app/SlidingListActivity.java deleted file mode 100644 index cd12806f9..000000000 --- a/library/src/com/slidingmenu/lib/app/SlidingListActivity.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.slidingmenu.lib.app; - -import android.app.ListActivity; -import android.os.Bundle; -import android.view.KeyEvent; -import android.view.View; -import android.view.ViewGroup.LayoutParams; -import android.widget.ListView; - -import com.slidingmenu.lib.SlidingMenu; - -public class SlidingListActivity extends ListActivity implements SlidingActivityBase { - - private SlidingActivityHelper mHelper; - - /* (non-Javadoc) - * @see android.app.Activity#onCreate(android.os.Bundle) - */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mHelper = new SlidingActivityHelper(this); - mHelper.onCreate(savedInstanceState); - ListView listView = new ListView(this); - listView.setId(android.R.id.list); - setContentView(listView); - } - - /* (non-Javadoc) - * @see android.app.Activity#onPostCreate(android.os.Bundle) - */ - @Override - public void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - mHelper.onPostCreate(savedInstanceState); - } - - /* (non-Javadoc) - * @see android.app.Activity#findViewById(int) - */ - @Override - public View findViewById(int id) { - View v = super.findViewById(id); - if (v != null) - return v; - return mHelper.findViewById(id); - } - - /* (non-Javadoc) - * @see android.app.Activity#onSaveInstanceState(android.os.Bundle) - */ - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - mHelper.onSaveInstanceState(outState); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(int) - */ - @Override - public void setContentView(int id) { - setContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View) - */ - @Override - public void setContentView(View v) { - setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - @Override - public void setContentView(View v, LayoutParams params) { - super.setContentView(v, params); - mHelper.registerAboveContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) - */ - public void setBehindContentView(int id) { - setBehindContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) - */ - public void setBehindContentView(View v) { - setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - public void setBehindContentView(View v, LayoutParams params) { - mHelper.setBehindContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() - */ - public SlidingMenu getSlidingMenu() { - return mHelper.getSlidingMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() - */ - public void toggle() { - mHelper.toggle(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() - */ - public void showContent() { - mHelper.showContent(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() - */ - public void showMenu() { - mHelper.showMenu(); - } - - /* - * (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() - */ - public void showSecondaryMenu() { - mHelper.showSecondaryMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) - */ - public void setSlidingActionBarEnabled(boolean b) { - mHelper.setSlidingActionBarEnabled(b); - } - - /* (non-Javadoc) - * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) - */ - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - boolean b = mHelper.onKeyUp(keyCode, event); - if (b) return b; - return super.onKeyUp(keyCode, event); - } - -} diff --git a/library/src/com/slidingmenu/lib/app/SlidingPreferenceActivity.java b/library/src/com/slidingmenu/lib/app/SlidingPreferenceActivity.java deleted file mode 100644 index 403ab0cb3..000000000 --- a/library/src/com/slidingmenu/lib/app/SlidingPreferenceActivity.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.slidingmenu.lib.app; - -import com.slidingmenu.lib.SlidingMenu; - -import android.os.Bundle; -import android.preference.PreferenceActivity; -import android.view.KeyEvent; -import android.view.View; -import android.view.ViewGroup.LayoutParams; - -public class SlidingPreferenceActivity extends PreferenceActivity implements SlidingActivityBase { - - private SlidingActivityHelper mHelper; - - /* (non-Javadoc) - * @see android.app.Activity#onCreate(android.os.Bundle) - */ - @Override - public void onCreate(Bundle savedInstanceState) { - mHelper = new SlidingActivityHelper(this); - super.onCreate(savedInstanceState); - mHelper.onCreate(savedInstanceState); - } - - /* (non-Javadoc) - * @see android.app.Activity#onPostCreate(android.os.Bundle) - */ - @Override - public void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - mHelper.onPostCreate(savedInstanceState); - } - - /* (non-Javadoc) - * @see android.app.Activity#findViewById(int) - */ - @Override - public View findViewById(int id) { - View v = super.findViewById(id); - if (v != null) - return v; - return mHelper.findViewById(id); - } - - /* (non-Javadoc) - * @see android.app.Activity#onSaveInstanceState(android.os.Bundle) - */ - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - mHelper.onSaveInstanceState(outState); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(int) - */ - @Override - public void setContentView(int id) { - setContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View) - */ - @Override - public void setContentView(View v) { - setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - @Override - public void setContentView(View v, LayoutParams params) { - super.setContentView(v, params); - mHelper.registerAboveContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) - */ - public void setBehindContentView(int id) { - setBehindContentView(getLayoutInflater().inflate(id, null)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) - */ - public void setBehindContentView(View v) { - setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) - */ - public void setBehindContentView(View v, LayoutParams params) { - mHelper.setBehindContentView(v, params); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() - */ - public SlidingMenu getSlidingMenu() { - return mHelper.getSlidingMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() - */ - public void toggle() { - mHelper.toggle(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() - */ - public void showContent() { - mHelper.showContent(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() - */ - public void showMenu() { - mHelper.showMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() - */ - public void showSecondaryMenu() { - mHelper.showSecondaryMenu(); - } - - /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) - */ - public void setSlidingActionBarEnabled(boolean b) { - mHelper.setSlidingActionBarEnabled(b); - } - - /* (non-Javadoc) - * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) - */ - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - boolean b = mHelper.onKeyUp(keyCode, event); - if (b) return b; - return super.onKeyUp(keyCode, event); - } -} diff --git a/library/src/com/slidingmenu/lib/app/SlidingSherlockActivity.java b/library/src/com/slidingmenu/lib/app/SlidingSherlockActivity.java new file mode 100644 index 000000000..41801e14b --- /dev/null +++ b/library/src/com/slidingmenu/lib/app/SlidingSherlockActivity.java @@ -0,0 +1,152 @@ +package com.slidingmenu.lib.app; + +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.View; +import android.view.ViewGroup.LayoutParams; + +import com.actionbarsherlock.app.SherlockActivity; +import com.slidingmenu.lib.SlidingMenu; + +public class SlidingSherlockActivity extends SherlockActivity implements SlidingActivityBase { + + private SlidingActivityHelper mHelper; + + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mHelper = new SlidingActivityHelper(this); + mHelper.onCreate(savedInstanceState); + } + + /* (non-Javadoc) + * @see android.app.Activity#onPostCreate(android.os.Bundle) + */ + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + mHelper.onPostCreate(savedInstanceState); + } + + /* (non-Javadoc) + * @see android.app.Activity#findViewById(int) + */ + @Override + public View findViewById(int id) { + View v = super.findViewById(id); + if (v != null) + return v; + return mHelper.findViewById(id); + } + + /* (non-Javadoc) + * @see android.app.Activity#onSaveInstanceState(android.os.Bundle) + */ + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + mHelper.onSaveInstanceState(outState); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(int) + */ + @Override + public void setContentView(int id) { + setContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View) + */ + @Override + public void setContentView(View v) { + setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + @Override + public void setContentView(View v, LayoutParams params) { + super.setContentView(v, params); + mHelper.registerAboveContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) + */ + public void setBehindContentView(int id) { + setBehindContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) + */ + public void setBehindContentView(View v) { + setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + public void setBehindContentView(View v, LayoutParams params) { + mHelper.setBehindContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + */ + public SlidingMenu getSlidingMenu() { + return mHelper.getSlidingMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + */ + public void toggle() { + mHelper.toggle(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + */ + public void showContent() { + mHelper.showContent(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() + */ + public void showMenu() { + mHelper.showMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + */ + public void showSecondaryMenu() { + mHelper.showSecondaryMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) + */ + public void setSlidingActionBarEnabled(boolean b) { + mHelper.setSlidingActionBarEnabled(b); + } + + /* (non-Javadoc) + * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) + */ + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + boolean b = mHelper.onKeyUp(keyCode, event); + if (b) return b; + return super.onKeyUp(keyCode, event); + } + +} diff --git a/library/src/com/slidingmenu/lib/app/SlidingSherlockFragmentActivity.java b/library/src/com/slidingmenu/lib/app/SlidingSherlockFragmentActivity.java new file mode 100644 index 000000000..ec627a933 --- /dev/null +++ b/library/src/com/slidingmenu/lib/app/SlidingSherlockFragmentActivity.java @@ -0,0 +1,154 @@ +package com.slidingmenu.lib.app; + +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.View; +import android.view.ViewGroup.LayoutParams; + +import com.actionbarsherlock.app.SherlockFragmentActivity; +import com.slidingmenu.lib.SlidingMenu; + +public class SlidingSherlockFragmentActivity extends SherlockFragmentActivity implements SlidingActivityBase { + + private SlidingActivityHelper mHelper; + + /* (non-Javadoc) + * @see android.support.v4.app.FragmentActivity#onCreate(android.os.Bundle) + */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mHelper = new SlidingActivityHelper(this); + mHelper.onCreate(savedInstanceState); + } + + /* (non-Javadoc) + * @see android.app.Activity#onPostCreate(android.os.Bundle) + */ + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + mHelper.onPostCreate(savedInstanceState); + } + + /* (non-Javadoc) + * @see android.app.Activity#findViewById(int) + */ + @Override + public View findViewById(int id) { + View v = super.findViewById(id); + if (v != null) + return v; + if(mHelper != null) + return mHelper.findViewById(id); + else return null; + } + + /* (non-Javadoc) + * @see android.support.v4.app.FragmentActivity#onSaveInstanceState(android.os.Bundle) + */ + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + mHelper.onSaveInstanceState(outState); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(int) + */ + @Override + public void setContentView(int id) { + setContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View) + */ + @Override + public void setContentView(View v) { + setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + @Override + public void setContentView(View v, LayoutParams params) { + super.setContentView(v, params); + mHelper.registerAboveContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) + */ + public void setBehindContentView(int id) { + setBehindContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) + */ + public void setBehindContentView(View v) { + setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + public void setBehindContentView(View v, LayoutParams params) { + mHelper.setBehindContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + */ + public SlidingMenu getSlidingMenu() { + return mHelper.getSlidingMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + */ + public void toggle() { + mHelper.toggle(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + */ + public void showContent() { + mHelper.showContent(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() + */ + public void showMenu() { + mHelper.showMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + */ + public void showSecondaryMenu() { + mHelper.showSecondaryMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) + */ + public void setSlidingActionBarEnabled(boolean b) { + mHelper.setSlidingActionBarEnabled(b); + } + + /* (non-Javadoc) + * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) + */ + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + boolean b = mHelper.onKeyUp(keyCode, event); + if (b) return b; + return super.onKeyUp(keyCode, event); + } + +} diff --git a/library/src/com/slidingmenu/lib/app/SlidingSherlockListActivity.java b/library/src/com/slidingmenu/lib/app/SlidingSherlockListActivity.java new file mode 100644 index 000000000..bb61abe96 --- /dev/null +++ b/library/src/com/slidingmenu/lib/app/SlidingSherlockListActivity.java @@ -0,0 +1,157 @@ +package com.slidingmenu.lib.app; + +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.View; +import android.view.ViewGroup.LayoutParams; +import android.widget.ListView; + +import com.actionbarsherlock.app.SherlockListActivity; +import com.slidingmenu.lib.SlidingMenu; + +public class SlidingSherlockListActivity extends SherlockListActivity implements SlidingActivityBase { + + private SlidingActivityHelper mHelper; + + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mHelper = new SlidingActivityHelper(this); + mHelper.onCreate(savedInstanceState); + ListView listView = new ListView(this); + listView.setId(android.R.id.list); + setContentView(listView); + } + + /* (non-Javadoc) + * @see android.app.Activity#onPostCreate(android.os.Bundle) + */ + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + mHelper.onPostCreate(savedInstanceState); + } + + /* (non-Javadoc) + * @see android.app.Activity#findViewById(int) + */ + @Override + public View findViewById(int id) { + View v = super.findViewById(id); + if (v != null) + return v; + return mHelper.findViewById(id); + } + + /* (non-Javadoc) + * @see android.app.Activity#onSaveInstanceState(android.os.Bundle) + */ + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + mHelper.onSaveInstanceState(outState); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(int) + */ + @Override + public void setContentView(int id) { + setContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View) + */ + @Override + public void setContentView(View v) { + setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + @Override + public void setContentView(View v, LayoutParams params) { + super.setContentView(v, params); + mHelper.registerAboveContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) + */ + public void setBehindContentView(int id) { + setBehindContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) + */ + public void setBehindContentView(View v) { + setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + public void setBehindContentView(View v, LayoutParams params) { + mHelper.setBehindContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + */ + public SlidingMenu getSlidingMenu() { + return mHelper.getSlidingMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + */ + public void toggle() { + mHelper.toggle(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + */ + public void showContent() { + mHelper.showContent(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() + */ + public void showMenu() { + mHelper.showMenu(); + } + + /* + * (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + */ + public void showSecondaryMenu() { + mHelper.showSecondaryMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) + */ + public void setSlidingActionBarEnabled(boolean b) { + mHelper.setSlidingActionBarEnabled(b); + } + + /* (non-Javadoc) + * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) + */ + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + boolean b = mHelper.onKeyUp(keyCode, event); + if (b) return b; + return super.onKeyUp(keyCode, event); + } + +} diff --git a/library/src/com/slidingmenu/lib/app/SlidingSherlockPreferenceActivity.java b/library/src/com/slidingmenu/lib/app/SlidingSherlockPreferenceActivity.java new file mode 100644 index 000000000..c803ecccb --- /dev/null +++ b/library/src/com/slidingmenu/lib/app/SlidingSherlockPreferenceActivity.java @@ -0,0 +1,151 @@ +package com.slidingmenu.lib.app; + +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.View; +import android.view.ViewGroup.LayoutParams; + +import com.actionbarsherlock.app.SherlockPreferenceActivity; +import com.slidingmenu.lib.SlidingMenu; + +public class SlidingSherlockPreferenceActivity extends SherlockPreferenceActivity implements SlidingActivityBase { + + private SlidingActivityHelper mHelper; + + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ + @Override + public void onCreate(Bundle savedInstanceState) { + mHelper = new SlidingActivityHelper(this); + super.onCreate(savedInstanceState); + mHelper.onCreate(savedInstanceState); + } + + /* (non-Javadoc) + * @see android.app.Activity#onPostCreate(android.os.Bundle) + */ + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + mHelper.onPostCreate(savedInstanceState); + } + + /* (non-Javadoc) + * @see android.app.Activity#findViewById(int) + */ + @Override + public View findViewById(int id) { + View v = super.findViewById(id); + if (v != null) + return v; + return mHelper.findViewById(id); + } + + /* (non-Javadoc) + * @see android.app.Activity#onSaveInstanceState(android.os.Bundle) + */ + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + mHelper.onSaveInstanceState(outState); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(int) + */ + @Override + public void setContentView(int id) { + setContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View) + */ + @Override + public void setContentView(View v) { + setContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see android.app.Activity#setContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + @Override + public void setContentView(View v, LayoutParams params) { + super.setContentView(v, params); + mHelper.registerAboveContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) + */ + public void setBehindContentView(int id) { + setBehindContentView(getLayoutInflater().inflate(id, null)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) + */ + public void setBehindContentView(View v) { + setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) + */ + public void setBehindContentView(View v, LayoutParams params) { + mHelper.setBehindContentView(v, params); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + */ + public SlidingMenu getSlidingMenu() { + return mHelper.getSlidingMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + */ + public void toggle() { + mHelper.toggle(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + */ + public void showContent() { + mHelper.showContent(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() + */ + public void showMenu() { + mHelper.showMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + */ + public void showSecondaryMenu() { + mHelper.showSecondaryMenu(); + } + + /* (non-Javadoc) + * @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) + */ + public void setSlidingActionBarEnabled(boolean b) { + mHelper.setSlidingActionBarEnabled(b); + } + + /* (non-Javadoc) + * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent) + */ + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + boolean b = mHelper.onKeyUp(keyCode, event); + if (b) return b; + return super.onKeyUp(keyCode, event); + } +}