Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f072aa97 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] [A11y] Add description for seekbar" into tm-dev am: 14f92d88 

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



Change-Id: I050c68a2b142fd6fbd81389db43a6672d5cd10f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7dede853 14f92d88

packages/SystemUI/res/layout/media_output_list_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
                android:paddingStart="0dp"

                android:paddingEnd="0dp"

                android:background="@null"

                android:contentDescription="@string/media_output_dialog_accessibility_seekbar"

                android:progressDrawable="@drawable/media_output_dialog_seekbar_background"

                android:thumb="@null"

                android:layout_width="match_parent"

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2281,6 +2281,8 @@ 
    <string name="media_output_dialog_button_stop_casting">Stop casting</string>

    <!-- Accessibility text describing purpose of media output dialog. [CHAR LIMIT=NONE] -->

    <string name="media_output_dialog_accessibility_title">Available devices for audio output.</string>

    <!-- Accessibility text describing purpose of seekbar in media output dialog. [CHAR LIMIT=NONE] -->

    <string name="media_output_dialog_accessibility_seekbar">Volume</string>



    <!-- Media Output Broadcast Dialog -->

    <!-- Title for Broadcast First Notify Dialog [CHAR LIMIT=60] -->

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.widget.CheckBox; 
import androidx.annotation.NonNull;

import androidx.core.widget.CompoundButtonCompat;



import com.android.settingslib.Utils;

import com.android.settingslib.media.LocalMediaManager.MediaDeviceState;

import com.android.settingslib.media.MediaDevice;

import com.android.systemui.R;
@@ -257,9 +256,8 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                setSingleLineLayout(mContext.getText(R.string.media_output_dialog_pairing_new),

                        false /* bFocused */);

                final Drawable d = mContext.getDrawable(R.drawable.ic_add);

                d.setColorFilter(new PorterDuffColorFilter(

                        Utils.getColorAccentDefaultColor(mContext), PorterDuff.Mode.SRC_IN));

                mTitleIcon.setImageDrawable(d);

                mTitleIcon.setColorFilter(mController.getColorItemContent());

                mContainerLayout.setOnClickListener(mController::launchBluetoothPairing);

            }

        }