diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml index bfa7c02984..5f8c632845 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml @@ -81,7 +81,6 @@ android:progress="50" android:id="@+id/sb_musuc_progess" android:splitTrack="false" - android:background="@null" android:thumb="@drawable/charter_p_music_seekbar_thumb" android:duplicateParentState="true" app:layout_constraintStart_toStartOf="parent" diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arrived.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arrived.png index 7ebe72d080..32fc7d5af8 100644 Binary files a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arrived.png and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arrived.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arriving.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arriving.png index ee96bb0edc..790562578c 100644 Binary files a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arriving.png and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arriving.png differ diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml index db389e16c1..6853846cdb 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml @@ -41,6 +41,7 @@ - + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml index 7e50a82b04..85be1e3a15 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml @@ -69,6 +69,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_tag" android:layout_marginTop="@dimen/dp_41" + android:duplicateParentState="true" android:progressDrawable="@drawable/taxt_p_music_seekbar_style" android:paddingTop="@dimen/dp_16" android:paddingBottom="@dimen/dp_16" diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png index 7ebe72d080..32fc7d5af8 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png index ee96bb0edc..790562578c 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml index 568510a85a..abc74836b5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml @@ -41,6 +41,7 @@