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

Commit 3e371a0a authored by Coco Duan's avatar Coco Duan Committed by Android (Google) Code Review
Browse files

Merge "Remove the edit button from glanceable hub" into main

parents 0b7e5b5d 920b51b2

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+1 −7
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import androidx.compose.foundation.lazy.grid.rememberLazyGridState 
import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.filled.Add

import androidx.compose.material.icons.filled.Edit

import androidx.compose.material.icons.outlined.Delete

import androidx.compose.material.icons.outlined.Edit

import androidx.compose.material.icons.outlined.TouchApp
@@ -60,7 +59,6 @@ import androidx.compose.material3.Card 
import androidx.compose.material3.CardDefaults

import androidx.compose.material3.FilledIconButton

import androidx.compose.material3.Icon

import androidx.compose.material3.IconButton

import androidx.compose.material3.IconButtonColors

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.OutlinedButton
@@ -217,10 +215,6 @@ fun CommunalHub( 
                },

                removeEnabled = removeButtonEnabled

            )

        } else {

            IconButton(onClick = viewModel::onOpenWidgetEditor) {

                Icon(Icons.Default.Edit, stringResource(R.string.button_to_open_widget_editor))

            }

        }



        if (isPopupOnDismissCtaShowing) {
@@ -388,7 +382,7 @@ private fun Toolbar( 
            colors = filledButtonColors(),

            contentPadding = Dimensions.ButtonPadding

        ) {

            Icon(Icons.Default.Add, stringResource(R.string.button_to_open_widget_editor))

            Icon(Icons.Default.Add, stringResource(R.string.hub_mode_add_widget_button_text))

            Spacer(spacerModifier)

            Text(

                text = stringResource(R.string.hub_mode_add_widget_button_text),

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -1077,8 +1077,6 @@ 
    <!-- Indicator on keyguard to start the communal tutorial. [CHAR LIMIT=100] -->

    <string name="communal_tutorial_indicator_text">Swipe left to start the communal tutorial</string>



    <!-- Description for the button that opens the widget editor on click. [CHAR LIMIT=50] -->

    <string name="button_to_open_widget_editor">Open the widget editor</string>

    <!-- Text for CTA button that launches the hub mode widget editor on click. [CHAR LIMIT=50] -->

    <string name="cta_tile_button_to_open_widget_editor">Customize</string>

    <!-- Text for CTA button that dismisses the tile on click. [CHAR LIMIT=50] -->