Skip to content

Commit

Permalink
Fixing up everything.
Browse files Browse the repository at this point in the history
  • Loading branch information
jfeinstein10 committed Jul 1, 2012
1 parent d5732a5 commit 91c1570
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion example/src/com/slidingmenu/example/ExampleActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public void onCreate(Bundle savedInstanceState) {
setBehindOffset((int)getResources().getDimension(R.dimen.actionbar_home_width));
setBehindScrollScale(0.5f);
this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
View v = this.getWindow().getDecorView();
}

public boolean onOptionsItemSelected(MenuItem item) {
Expand Down
7 changes: 2 additions & 5 deletions library/src/com/slidingmenu/lib/SlidingMenuActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public class SlidingMenuActivity extends SherlockActivity {

public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
View blah = getWindow().getDecorView();
// getWindow().requestFeature(Window.FEATURE_NO_TITLE);
super.setContentView(R.layout.slidingmenumain);
mSlidingMenu = (SlidingMenu) super.findViewById(R.id.slidingmenulayout);
Expand Down Expand Up @@ -59,12 +58,10 @@ public void setContentView(View v, LayoutParams params) {
if (!mContentViewCalled) {
mContentViewCalled = true;
}
View blah = getWindow().getDecorView();
RelativeLayout mainView = new RelativeLayout(this);
((ActionBarSherlockCompat)getSherlock()).generateLayout(mainView);
getSherlock().setContentView(v);
mSlidingMenu.setAboveContent(mainView, params);
blah = getWindow().getDecorView();
mSlidingMenu.setAboveView(mainView, params);
}

public void setBehindContentView(int id) {
Expand All @@ -79,7 +76,7 @@ public void setBehindContentView(View v, LayoutParams params) {
if (!mBehindContentViewCalled) {
mBehindContentViewCalled = true;
}
mSlidingMenu.setBehindContent(v);
mSlidingMenu.setBehindView(v);
}

private boolean isStatic() {
Expand Down

0 comments on commit 91c1570

Please sign in to comment.