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

Commit 03b5138a authored by Olivier St-Onge's avatar Olivier St-Onge
Browse files

Use final strings for edit mode and adjust the reset dialog UI 

Test: manually
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Fixes: 366257479
Change-Id: I31dcc380caed601c2b7c39b0b5b884ee70915c8a
parent 65198945

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -3917,10 +3917,10 @@ 
    </string>

    <!-- Title for the Reset Tiles dialog in QS Edit mode. [CHAR LIMIT=NONE] -->

    <string name="qs_edit_mode_reset_dialog_title">

        Reset tiles

        Reset all tiles?

    </string>

    <!-- Content of the Reset Tiles dialog in QS Edit mode. [CHAR LIMIT=NONE] -->

    <string name="qs_edit_mode_reset_dialog_content">

        Reset tiles to their original order and sizes?

        All Quick Settings tiles will reset to the device’s original settings

    </string>

</resources>

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt

+5 −3
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ fun DefaultEditTileGrid( 
                        if (dragIsInProgress) {

                            RemoveTileTarget()

                        } else {

                            Text(text = "Hold and drag to rearrange tiles.")

                            Text(text = stringResource(id = R.string.drag_to_rearrange_tiles))

                        }

                    }

                }
@@ -243,7 +243,9 @@ fun DefaultEditTileGrid( 
                            spacedBy(dimensionResource(id = R.dimen.qs_label_container_margin)),

                        modifier = modifier.fillMaxSize(),

                    ) {

                        EditGridHeader { Text(text = "Hold and drag to add tiles.") }

                        EditGridHeader {

                            Text(text = stringResource(id = R.string.drag_to_add_tiles))

                        }



                        AvailableTileGrid(otherTiles, selectionState, columns, listState)

                    }
@@ -289,7 +291,7 @@ private fun RemoveTileTarget() { 
                .padding(10.dp),

    ) {

        Icon(imageVector = Icons.Default.Clear, contentDescription = null)

        Text(text = "Remove")

        Text(text = stringResource(id = R.string.qs_customize_remove))

    }

}

packages/SystemUI/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegate.kt

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringResource 
import androidx.lifecycle.DefaultLifecycleObserver

import androidx.lifecycle.LifecycleOwner

import com.android.compose.PlatformButton

import com.android.compose.PlatformOutlinedButton

import com.android.compose.PlatformTextButton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dialog.ui.composable.AlertDialogContent

import com.android.systemui.qs.panels.domain.interactor.EditTilesResetInteractor
@@ -84,8 +84,8 @@ constructor( 
                    Text(stringResource(id = android.R.string.ok))

                }

            },

            neutralButton = {

                PlatformOutlinedButton(onClick = { dialog.dismiss() }) {

            negativeButton = {

                PlatformTextButton(onClick = { dialog.dismiss() }) {

                    Text(stringResource(id = android.R.string.cancel))

                }

            },