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

Commit 100b0929 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Update power menu info messsage" into sc-dev

parents 7bb24f63 be3e2e92
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -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:layout_width="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>
 No newline at end of file
+2 −0
Original line number Diff line number Diff line
@@ -2979,6 +2979,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>
+6 −0
Original line number Diff line number Diff line
@@ -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()