Skip to content

Commit e23d39e

Browse files
author
jfeinstein10
committed
Making CustomViewBehind2 CustomViewBehind and getting rid of the original
1 parent 610bdee commit e23d39e

File tree

4 files changed

+59
-1453
lines changed

4 files changed

+59
-1453
lines changed

example/AndroidManifest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
android:versionCode="1"
55
android:versionName="1.0" >
66

7-
<uses-sdk android:minSdkVersion="1" android:targetSdkVersion="14"/>
7+
<uses-sdk
8+
android:minSdkVersion="1"
9+
android:targetSdkVersion="14" />
810

911
<application
1012
android:icon="@drawable/ic_launcher"
1113
android:label="@string/app_name"
1214
android:theme="@style/Theme.Sherlock.Light.DarkActionBar" >
1315
<activity
1416
android:name=".ExampleActivity"
15-
android:uiOptions="splitActionBarWhenNarrow"
16-
android:label="@string/app_name" >
17+
android:label="@string/app_name"
18+
android:uiOptions="splitActionBarWhenNarrow" >
1719
<intent-filter>
1820
<action android:name="android.intent.action.MAIN" />
1921

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public float getInterpolation(float t) {
127127

128128
private boolean mLastTouchAllowed = false;
129129
private int mSlidingMenuThreshold = 30;
130-
private CustomViewBehind2 mCustomViewBehind2;
130+
private CustomViewBehind mCustomViewBehind2;
131131
private boolean mEnabled = true;
132132

133133
private OnPageChangeListener mOnPageChangeListener;
@@ -791,7 +791,7 @@ public void setContent(View v) {
791791
mContent = ii;
792792
}
793793

794-
public void setCustomViewBehind2(CustomViewBehind2 cvb) {
794+
public void setCustomViewBehind2(CustomViewBehind cvb) {
795795
mCustomViewBehind2 = cvb;
796796
}
797797

0 commit comments

Comments
 (0)