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

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

Merge "Controls Ui - More string adjustments" into rvc-dev

parents 7e85cd61 9e3d40d2
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@
    <TextView
        style="@style/TextAppearance.ControlSetup.Subtitle"
        android:id="@+id/controls_subtitle"
        android:visibility="gone"
        android:layout_marginTop="12dp"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+8 −9
Original line number Diff line number Diff line
@@ -2636,14 +2636,17 @@

    <!-- Quick Controls strings -->
    <!-- Quick Controls empty state, title [CHAR LIMIT=30] -->
    <string name="quick_controls_title">Quick Controls</string>
    <string name="quick_controls_title">Quick controls</string>
    <!-- Quick Controls empty state, subtitle [CHAR LIMIT=100] -->
    <string name="quick_controls_subtitle">Add controls for your connected devices</string>

    <!-- Controls management providers screen title [CHAR LIMIT=30]-->
    <string name="controls_providers_title">Add Controls</string>
    <!-- Controls management providers screen subtitle [CHAR LIMIT=NONE] -->
    <string name="controls_providers_subtitle">Choose app to add controls</string>
    <!-- Quick Controls setup, title [CHAR LIMIT=50] -->
    <string name="quick_controls_setup_title">Set up quick controls</string>
    <!-- Quick Controls setup, subtitle [CHAR LIMIT=100] -->
    <string name="quick_controls_setup_subtitle">Hold the Power button to access your controls</string>

    <!-- Controls management providers screen title [CHAR LIMIT=60]-->
    <string name="controls_providers_title">Choose app to add controls</string>
    <!-- Number of favorites for controls management screen [CHAR LIMIT=NONE]-->
    <plurals name="controls_number_of_favorites">
        <item quantity="one"><xliff:g id="number" example="1">%s</xliff:g> control added.</item>
@@ -2679,12 +2682,8 @@
    <string name="controls_pin_verifying">Verifying\u2026</string>
    <!-- Controls PIN entry dialog, text hint [CHAR LIMIT=30] -->
    <string name="controls_pin_instructions">Enter PIN</string>
    <!-- Controls passphrase entry dialog, text hint [CHAR LIMIT=30] -->
    <string name="controls_passphrase_instructions">Enter passphrase</string>
    <!-- Controls PIN entry dialog, text hint, retry [CHAR LIMIT=30] -->
    <string name="controls_pin_instructions_retry">Try another PIN</string>
    <!-- Controls passphrase entry dialog, text hint, retry [CHAR LIMIT=50] -->
    <string name="controls_passphrase_instructions_retry">Try another passphrase</string>
    <!-- Controls confirmation dialog, waiting to confirm [CHAR LIMIT=30] -->
    <string name="controls_confirmation_confirming">Confirming\u2026</string>
    <!-- Controls confirmation dialog, user prompt [CHAR LIMIT=NONE] -->
+1 −3
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ class ControlsProviderSelectorActivity @Inject constructor(

        requireViewById<TextView>(R.id.title).text =
                resources.getText(R.string.controls_providers_title)
        requireViewById<TextView>(R.id.subtitle).text =
                resources.getText(R.string.controls_providers_subtitle)

        requireViewById<Button>(R.id.done).setOnClickListener {
            this@ControlsProviderSelectorActivity.finishAffinity()
+4 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ class ControlsUiControllerImpl @Inject constructor (
        val inflater = LayoutInflater.from(context)
        inflater.inflate(R.layout.controls_no_favorites, parent, true)
        val subtitle = parent.requireViewById<TextView>(R.id.controls_subtitle)
        subtitle.setVisibility(View.VISIBLE)
        subtitle.setText(context.resources.getString(R.string.controls_seeding_in_progress))
    }

    private fun showInitialSetupView(items: List<SelectionItem>) {
@@ -184,6 +184,9 @@ class ControlsUiControllerImpl @Inject constructor (
        val viewGroup = parent.requireViewById(R.id.controls_no_favorites_group) as ViewGroup
        viewGroup.setOnClickListener(launchSelectorActivityListener(context))

        val subtitle = parent.requireViewById<TextView>(R.id.controls_subtitle)
        subtitle.setText(context.resources.getString(R.string.quick_controls_subtitle))

        val iconRowGroup = parent.requireViewById(R.id.controls_icon_row) as ViewGroup
        items.forEach {
            val imageView = inflater.inflate(R.layout.controls_icon, viewGroup, false) as ImageView