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

Commit 345901fd authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Fix close button in workEDU card not 48dp." into main

parents 35b7616c 9f1b9d1b

res/drawable/inset_rounded_action_button.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<inset xmlns:android="http://schemas.android.com/apk/res/android"

    android:insetTop="@dimen/inset_rounded_action_button"

    android:insetBottom="@dimen/inset_rounded_action_button"

    android:insetLeft="@dimen/inset_rounded_action_button"

    android:insetRight="@dimen/inset_rounded_action_button">

    <shape

        android:shape="rectangle">

        <solid android:color="@color/materialColorSurfaceContainerLow" />

        <corners android:radius="@dimen/rounded_button_radius" />

        <stroke

            android:width="1dp"

            android:color="@color/materialColorSurfaceContainerLow" />

    </shape>

</inset>

res/layout/work_apps_edu.xml

+7 −4
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ 
        android:orientation="horizontal"

        android:background="@drawable/work_card"

        android:layout_gravity="center_horizontal"

        android:paddingEnd="@dimen/work_card_margin"

        android:paddingStart="@dimen/work_card_margin"

        android:paddingTop="@dimen/work_card_margin"

        android:paddingEnd="@dimen/work_card_margin_end"

        android:paddingBottom="@dimen/work_card_margin"

        android:id="@+id/wrapper">

        <TextView
@@ -37,18 +36,22 @@ 
            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginTop="@dimen/work_card_margin"

            android:paddingEnd="@dimen/work_edu_card_text_end_margin"

            android:text="@string/work_profile_edu_work_apps"

            android:textDirection="locale"

            android:textSize="18sp" />

        <FrameLayout

            android:id="@+id/action_btn"

            android:layout_width="@dimen/rounded_button_width"

            android:layout_height="@dimen/rounded_button_width"

            android:background="@drawable/rounded_action_button">

            android:layout_marginTop="@dimen/work_edu_card_button_margin_top"

            android:gravity="center"

            android:background="@drawable/inset_rounded_action_button">

            <ImageButton

                android:id="@+id/action_btn"

                android:layout_width="@dimen/x_icon_size"

                android:layout_height="@dimen/x_icon_size"

                android:clickable="false"

                android:scaleType="centerInside"

                android:layout_gravity="center"

                android:contentDescription="@string/accessibility_close"

res/values/dimens.xml

+5 −2
Original line number Diff line number Diff line
@@ -173,13 +173,16 @@ 
    <dimen name="work_edu_card_margin">16dp</dimen>

    <dimen name="work_edu_card_radius">16dp</dimen>

    <dimen name="work_edu_card_bottom_margin">26dp</dimen>

    <dimen name="work_edu_card_text_end_margin">32dp</dimen>

    <dimen name="work_edu_card_text_end_margin">12dp</dimen>

    <dimen name="work_apps_paused_button_stroke">1dp</dimen>

    <dimen name="work_edu_card_button_margin_top">12dp</dimen>



    <dimen name="work_card_margin">24dp</dimen>

    <dimen name="work_card_margin_end">12dp</dimen>

    <!-- (x) icon button inside work edu card -->

    <dimen name="rounded_button_width">24dp</dimen>

    <dimen name="rounded_button_width">48dp</dimen>

    <dimen name="x_icon_size">16dp</dimen>

    <dimen name="inset_rounded_action_button">12dp</dimen>



    <!-- rounded button shown inside card views, and snack bars  -->

    <dimen name="padded_rounded_button_height">48dp</dimen>