Merge branch 'playback_resume_v2' into playback_state_list

This commit is contained in:
Vasiliy 2019-04-15 22:19:54 +03:00
commit f47c5e53b1
No known key found for this signature in database
GPG key ID: 9F74C4D2874D7523
2 changed files with 2 additions and 0 deletions

View file

@ -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" />

View file

@ -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" />