diff options
| author | 2024-04-12 15:15:48 +0000 | |
|---|---|---|
| committer | 2024-04-15 13:25:58 +0000 | |
| commit | bb8f1da6a00aec9faeea0c94426a449c517beca9 (patch) | |
| tree | fa1f119403a7237d543a64cf9093751640954f1b | |
| parent | 5eb75b51d380879fc765432002db1b135142e5cf (diff) | |
Simplifications for shelf_action_chip
Remove custom wrapper class, don't set alpha.
Bug: 329659738
Test: Manual verification
Flag: ACONFIG com.android.systemui.screenshot_shelf_ui DEVELOPMENT
Change-Id: Id1b0d9656b79180bf5489a848721ab4caa289c68
Merged-In: Id1b0d9656b79180bf5489a848721ab4caa289c68
| -rw-r--r-- | packages/SystemUI/res/layout/shelf_action_chip.xml | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/packages/SystemUI/res/layout/shelf_action_chip.xml b/packages/SystemUI/res/layout/shelf_action_chip.xml index 709c80d07088..c7606e404215 100644 --- a/packages/SystemUI/res/layout/shelf_action_chip.xml +++ b/packages/SystemUI/res/layout/shelf_action_chip.xml @@ -14,33 +14,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<com.android.systemui.screenshot.OverlayActionChip +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/overlay_action_chip" android:theme="@style/FloatingOverlay" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" + android:orientation="horizontal" + android:paddingVertical="@dimen/overlay_action_chip_padding_vertical" android:gravity="center" - android:alpha="0.0"> - <LinearLayout + android:background="@drawable/shelf_action_chip_background" + > + <ImageView + android:id="@+id/overlay_action_chip_icon" + android:tint="?androidprv:attr/materialColorOnSecondary" + android:layout_width="@dimen/overlay_action_chip_icon_size" + android:layout_height="@dimen/overlay_action_chip_icon_size"/> + <TextView + android:id="@+id/overlay_action_chip_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingVertical="@dimen/overlay_action_chip_padding_vertical" - android:background="@drawable/shelf_action_chip_background" - android:gravity="center"> - <ImageView - android:id="@+id/overlay_action_chip_icon" - android:tint="?androidprv:attr/materialColorOnSecondary" - android:layout_width="@dimen/overlay_action_chip_icon_size" - android:layout_height="@dimen/overlay_action_chip_icon_size"/> - <TextView - android:id="@+id/overlay_action_chip_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="@*android:string/config_headlineFontFamilyMedium" - android:textSize="@dimen/overlay_action_chip_text_size" - android:textColor="?androidprv:attr/materialColorOnSecondary"/> - </LinearLayout> -</com.android.systemui.screenshot.OverlayActionChip> + android:fontFamily="@*android:string/config_headlineFontFamilyMedium" + android:textSize="@dimen/overlay_action_chip_text_size" + android:textColor="?androidprv:attr/materialColorOnSecondary"/> +</LinearLayout> |