Merge "[Output Switcher] [A11y] Add description for seekbar" into tm-dev am: 14f92d8897 am: 491dbedcfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18572029 Change-Id: I6d04d7ce7d410fc2cb28f9c76a4dac885c0670b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -2309,6 +2309,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] -->
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user