Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix constraints for collapsed layout" into tm-qpr-dev am: 864fee85c9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19262311

Change-Id: I43b5d1b24bb1cfcd9568897d7fa1aa2cb54f8125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beth Thibodeau
2022-07-13 14:53:49 +00:00
committed by Automerger Merge Worker
parent ce7914fd28 864fee85c9
commit 47d0f9f6db
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/media_session_view.xml
View File

@@ -150,7 +150,7 @@
<!-- See comment in media_session_collapsed.xml for how these barriers are used --> <!-- See comment in media_session_collapsed.xml for how these barriers are used -->
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/media_action_barrier" android:id="@+id/media_action_barrier_start"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:orientation="vertical" android:orientation="vertical"
@@ -172,6 +172,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
/> />
<!-- This barrier is used in expanded view to constrain the bottom row of actions -->
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/media_action_barrier_top" android:id="@+id/media_action_barrier_top"
android:layout_width="match_parent" android:layout_width="match_parent"

17
packages/SystemUI/res/xml/media_session_collapsed.xml
View File

@@ -19,7 +19,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<Constraint <Constraint
android:id="@+id/media_action_barrier" android:id="@+id/media_action_barrier_start"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/media_seamless" app:layout_constraintTop_toBottomOf="@id/media_seamless"
@@ -91,12 +91,16 @@
app:layout_constraintRight_toLeftOf="@id/media_progress_bar" app:layout_constraintRight_toLeftOf="@id/media_progress_bar"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/media_seamless" app:layout_constraintTop_toBottomOf="@id/media_seamless"
app:layout_constraintLeft_toRightOf="@id/media_action_barrier" /> app:layout_constraintLeft_toRightOf="@id/media_action_barrier_start" />
<!-- Showing time while scrubbing isn't available in collapsed mode. --> <!-- Showing time while scrubbing isn't available in collapsed mode. -->
<Constraint <Constraint
android:id="@+id/media_scrubbing_elapsed_time" android:id="@+id/media_scrubbing_elapsed_time"
android:visibility="gone" /> android:visibility="gone"
app:layout_constraintRight_toLeftOf="@id/media_progress_bar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/media_seamless"
app:layout_constraintLeft_toRightOf="@id/media_action_barrier_start" />
<Constraint <Constraint
android:id="@+id/media_progress_bar" android:id="@+id/media_progress_bar"
@@ -124,7 +128,12 @@
<!-- Showing time while scrubbing isn't available in collapsed mode. --> <!-- Showing time while scrubbing isn't available in collapsed mode. -->
<Constraint <Constraint
android:id="@+id/media_scrubbing_total_time" android:id="@+id/media_scrubbing_total_time"
android:visibility="gone" /> android:visibility="gone"
app:layout_constraintVertical_bias="1"
app:layout_constraintLeft_toRightOf="@id/media_progress_bar"
app:layout_constraintRight_toLeftOf="@id/action0"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/media_seamless" />
<Constraint <Constraint
android:id="@+id/action0" android:id="@+id/action0"

5
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -1005,16 +1005,13 @@ public class MediaControlPanel {
private void bindScrubbingTime(MediaData data) { private void bindScrubbingTime(MediaData data) {
ConstraintSet expandedSet = mMediaViewController.getExpandedLayout(); ConstraintSet expandedSet = mMediaViewController.getExpandedLayout();
ConstraintSet collapsedSet = mMediaViewController.getCollapsedLayout();
int elapsedTimeId = mMediaViewHolder.getScrubbingElapsedTimeView().getId(); int elapsedTimeId = mMediaViewHolder.getScrubbingElapsedTimeView().getId();
int totalTimeId = mMediaViewHolder.getScrubbingTotalTimeView().getId(); int totalTimeId = mMediaViewHolder.getScrubbingTotalTimeView().getId();
boolean visible = scrubbingTimeViewsEnabled(data.getSemanticActions()) && mIsScrubbing; boolean visible = scrubbingTimeViewsEnabled(data.getSemanticActions()) && mIsScrubbing;
setVisibleAndAlpha(expandedSet, elapsedTimeId, visible); setVisibleAndAlpha(expandedSet, elapsedTimeId, visible);
setVisibleAndAlpha(expandedSet, totalTimeId, visible); setVisibleAndAlpha(expandedSet, totalTimeId, visible);
// Never show in collapsed // Collapsed view is always GONE as set in XML, so doesn't need to be updated dynamically
setVisibleAndAlpha(collapsedSet, elapsedTimeId, false);
setVisibleAndAlpha(collapsedSet, totalTimeId, false);
} }
private boolean scrubbingTimeViewsEnabled(@Nullable MediaButton semanticActions) { private boolean scrubbingTimeViewsEnabled(@Nullable MediaButton semanticActions) {