Merge "Controls UI - Fix dropdown layer list" into rvc-dev am: c828071246 am: 7b436ae640

Change-Id: I52302fb098544df6ee31b5f602477ca050252e9c
This commit is contained in:
Matt Pietal
2020-05-21 16:22:03 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 6 deletions

View File

@@ -20,11 +20,6 @@
android:paddingEnd="40dp" android:paddingEnd="40dp"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp"> android:paddingRight="0dp">
<item
android:gravity="end|fill_vertical"
android:width="40dp"
android:drawable="@*android:drawable/control_background_40dp_material" />
<item <item
android:drawable="@drawable/ic_ksh_key_down" android:drawable="@drawable/ic_ksh_key_down"
android:gravity="end|bottom" android:gravity="end|bottom"

View File

@@ -368,7 +368,7 @@ class ControlsUiControllerImpl @Inject constructor (
val spinner = parent.requireViewById<TextView>(R.id.app_or_structure_spinner).apply { val spinner = parent.requireViewById<TextView>(R.id.app_or_structure_spinner).apply {
setText(selectionItem.getTitle()) setText(selectionItem.getTitle())
// override the default color on the dropdown drawable // override the default color on the dropdown drawable
(getBackground() as LayerDrawable).getDrawable(1) (getBackground() as LayerDrawable).getDrawable(0)
.setTint(context.resources.getColor(R.color.control_spinner_dropdown, null)) .setTint(context.resources.getColor(R.color.control_spinner_dropdown, null))
} }