Skip to content

Commit 0445497

Browse files
committed
Renamed the panelHeight attribute
1 parent 5e8c21c commit 0445497

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

demo/res/layout/activity_demo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"
1212
android:gravity="bottom"
13-
sothree:collapsedHeight="68dp"
13+
sothree:panelHeight="68dp"
1414
sothree:shadowHeight="4dp"
1515
sothree:dragView="@+id/name">
1616

library/res/values/attrs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources>
33

44
<declare-styleable name="SlidingUpPanelLayout">
5-
<attr name="collapsedHeight" format="dimension" />
5+
<attr name="panelHeight" format="dimension" />
66
<attr name="shadowHeight" format="dimension" />
77
<attr name="fadeColor" format="color" />
88
<attr name="flingVelocity" format="integer" />

library/src/com/sothree/slidinguppanel/SlidingUpPanelLayout.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public SlidingUpPanelLayout(Context context, AttributeSet attrs, int defStyle) {
259259
TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.SlidingUpPanelLayout);
260260

261261
if (ta != null) {
262-
mPanelHeight = ta.getDimensionPixelSize(R.styleable.SlidingUpPanelLayout_collapsedHeight, -1);
262+
mPanelHeight = ta.getDimensionPixelSize(R.styleable.SlidingUpPanelLayout_panelHeight, -1);
263263
mShadowHeight = ta.getDimensionPixelSize(R.styleable.SlidingUpPanelLayout_shadowHeight, -1);
264264

265265
mMinFlingVelocity = ta.getInt(R.styleable.SlidingUpPanelLayout_flingVelocity, DEFAULT_MIN_FLING_VELOCITY);
@@ -396,7 +396,6 @@ public boolean isOverlayed() {
396396
return mOverlayContent;
397397
}
398398

399-
400399
void dispatchOnPanelSlide(View panel) {
401400
if (mPanelSlideListener != null) {
402401
mPanelSlideListener.onPanelSlide(panel, mSlideOffset);

0 commit comments

Comments
 (0)