[DO NOT MERGE] Update power menu info messsage

Allow wallet label to be determined by the service (same as in the
QuickAccessWalletTile)

Bug: 190505997
Test: visual
Change-Id: I4a81d4ca13f1bf828a223a36e492a79e8cfc63e4
This commit is contained in:
Beth Thibodeau
2021-06-10 16:07:44 -04:00
parent cdbc555a0b
commit be3e2e9228
3 changed files with 20 additions and 3 deletions

View File

@@ -14,8 +14,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<ImageView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/global_actions_change_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content">
<TextView
android:id="@+id/global_actions_change_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/global_actions_change_description" />
<ImageView
android:id="@+id/global_actions_change_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>

View File

@@ -2977,6 +2977,8 @@
<!-- Content description for a chip in the status bar showing that the user is currently on a phone call. [CHAR LIMIT=NONE] -->
<string name="ongoing_phone_call_content_description">Ongoing phone call</string>
<!-- Placeholder for string describing changes in global actions -->
<string name="global_actions_change_description" translatable="false"><xliff:g>%1$s</xliff:g></string>
<!-- URL for more information about changes in global actions -->
<string name="global_actions_change_url" translatable="false"></string>
</resources>

View File

@@ -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<TextView>(R.id.global_actions_change_message)
message?.setText(context.getString(R.string.global_actions_change_description, walletTitle))
val button = view.findViewById<ImageView>(R.id.global_actions_change_button)
button.setOnClickListener { _ ->
dismissParent.run()