Merge branch 'playback_resume_v2' into playback_state_list
This commit is contained in:
commit
f47c5e53b1
|
@ -142,6 +142,7 @@
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
android:progressDrawable="?attr/progress_horizontal_drawable"
|
android:progressDrawable="?attr/progress_horizontal_drawable"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
|
app:layout_scrollFlags="scroll"
|
||||||
tools:max="100"
|
tools:max="100"
|
||||||
tools:progress="40"
|
tools:progress="40"
|
||||||
tools:visibility="visible" />
|
tools:visibility="visible" />
|
||||||
|
|
|
@ -140,6 +140,7 @@
|
||||||
android:layout_marginTop="-2dp"
|
android:layout_marginTop="-2dp"
|
||||||
android:progressDrawable="?attr/progress_horizontal_drawable"
|
android:progressDrawable="?attr/progress_horizontal_drawable"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
|
app:layout_scrollFlags="scroll"
|
||||||
tools:max="100"
|
tools:max="100"
|
||||||
tools:progress="40"
|
tools:progress="40"
|
||||||
tools:visibility="visible" />
|
tools:visibility="visible" />
|
||||||
|
|
Loading…
Reference in New Issue