Skip to content

Commit 91c1570

Browse files
author
jfeinstein10
committed
Fixing up everything.
1 parent d5732a5 commit 91c1570

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

example/src/com/slidingmenu/example/ExampleActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public void onCreate(Bundle savedInstanceState) {
1616
setBehindOffset((int)getResources().getDimension(R.dimen.actionbar_home_width));
1717
setBehindScrollScale(0.5f);
1818
this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
19-
View v = this.getWindow().getDecorView();
2019
}
2120

2221
public boolean onOptionsItemSelected(MenuItem item) {

library/src/com/slidingmenu/lib/SlidingMenuActivity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class SlidingMenuActivity extends SherlockActivity {
3030

3131
public void onCreate(Bundle savedInstanceState) {
3232
super.onCreate(savedInstanceState);
33-
View blah = getWindow().getDecorView();
3433
// getWindow().requestFeature(Window.FEATURE_NO_TITLE);
3534
super.setContentView(R.layout.slidingmenumain);
3635
mSlidingMenu = (SlidingMenu) super.findViewById(R.id.slidingmenulayout);
@@ -59,12 +58,10 @@ public void setContentView(View v, LayoutParams params) {
5958
if (!mContentViewCalled) {
6059
mContentViewCalled = true;
6160
}
62-
View blah = getWindow().getDecorView();
6361
RelativeLayout mainView = new RelativeLayout(this);
6462
((ActionBarSherlockCompat)getSherlock()).generateLayout(mainView);
6563
getSherlock().setContentView(v);
66-
mSlidingMenu.setAboveContent(mainView, params);
67-
blah = getWindow().getDecorView();
64+
mSlidingMenu.setAboveView(mainView, params);
6865
}
6966

7067
public void setBehindContentView(int id) {
@@ -79,7 +76,7 @@ public void setBehindContentView(View v, LayoutParams params) {
7976
if (!mBehindContentViewCalled) {
8077
mBehindContentViewCalled = true;
8178
}
82-
mSlidingMenu.setBehindContent(v);
79+
mSlidingMenu.setBehindView(v);
8380
}
8481

8582
private boolean isStatic() {

0 commit comments

Comments
 (0)