diff --git a/packages/SystemUI/res/layout/global_actions_change_panel.xml b/packages/SystemUI/res/layout/global_actions_change_panel.xml index dffb0f011bb5d..e0ba813d758a6 100644 --- a/packages/SystemUI/res/layout/global_actions_change_panel.xml +++ b/packages/SystemUI/res/layout/global_actions_change_panel.xml @@ -14,8 +14,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + android:layout_height="wrap_content"> + + + \ No newline at end of file diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 91301dfda5e81..93ce8f3c2a96f 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2979,6 +2979,8 @@ Ongoing phone call + + %1$s diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsInfoProvider.kt b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsInfoProvider.kt index 39008eecd6a2b..17b532a643cdd 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsInfoProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsInfoProvider.kt @@ -25,6 +25,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import android.widget.ImageView +import android.widget.TextView import com.android.systemui.R import com.android.systemui.controls.controller.ControlsController import com.android.systemui.plugins.ActivityStarter @@ -70,6 +71,11 @@ class GlobalActionsInfoProvider @Inject constructor( val view = LayoutInflater.from(context).inflate(R.layout.global_actions_change_panel, parent, false) + + val walletTitle = walletClient.serviceLabel ?: context.getString(R.string.wallet_title) + val message = view.findViewById(R.id.global_actions_change_message) + message?.setText(context.getString(R.string.global_actions_change_description, walletTitle)) + val button = view.findViewById(R.id.global_actions_change_button) button.setOnClickListener { _ -> dismissParent.run()