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

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

Merge "Change work_app_edu to be like T spec:... 

Merge "Change work_app_edu to be like T spec: https://screenshot.googleplex.com/43ThiCnqrAqAQgE" into tm-dev
parents 510a8185 d20011be

res/layout/work_apps_edu.xml

+32 −20
Original line number Diff line number Diff line
@@ -19,37 +19,49 @@ 
    android:layout_marginTop="8dp"

    android:gravity="center">



    <LinearLayout

    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:paddingHorizontal="@dimen/work_card_padding_horizontal"

        android:paddingVertical="@dimen/work_card_padding_horizontal"

        android:orientation="horizontal"

        android:background="@drawable/work_card"

        android:layout_gravity="center_horizontal"

        android:gravity="center"

        android:paddingEnd="@dimen/work_card_margin"

        android:paddingStart="@dimen/work_card_margin"

        android:paddingTop="@dimen/work_card_margin"

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



        <TextView

            style="@style/PrimaryHeadline"

            android:textColor="?android:attr/textColorPrimary"

            android:id="@+id/work_apps_paused_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/work_card_padding_horizontal"

            android:layout_marginBottom="@dimen/work_card_margin"

            android:layout_marginRight="@dimen/work_card_margin"

            android:text="@string/work_profile_edu_work_apps"

            android:textAlignment="center"

            android:textSize="20sp" />



        <Button

            android:textSize="18sp" />

        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="@dimen/work_card_button_height"

            android:id="@+id/action_btn"

            android:textColor="?attr/workProfileOverlayTextColor"

            android:text="@string/work_profile_edu_accept"

            android:textAlignment="center"

            android:layout_height="@dimen/padded_rounded_button_height"

            android:orientation="horizontal"

            >

            <FrameLayout

                android:layout_width="@dimen/rounded_button_width"

                android:layout_height="@dimen/rounded_button_width"

                android:background="@drawable/rounded_action_button"

                android:padding="@dimen/rounded_button_padding"

                android:layout_alignParentRight="true">

                <ImageButton

                    android:layout_width="@dimen/x_icon_size"

                    android:layout_height="@dimen/x_icon_size"

                    android:id="@+id/action_btn"

                    android:src="@drawable/ic_remove_no_shadow"

                    android:layout_gravity="center"

                    android:padding="@dimen/x_icon_padding" />

            </FrameLayout>

        </RelativeLayout>



    </RelativeLayout>







            android:textSize="14sp" />

    </LinearLayout>

</com.android.launcher3.allapps.WorkEduCard>
 
 No newline at end of file

res/layout/work_mode_fab.xml

+2 −0
Original line number Diff line number Diff line
@@ -29,4 +29,6 @@ 
    android:drawableStart="@drawable/ic_corp_off"

    android:layout_marginBottom="@dimen/work_fab_margin"

    android:layout_marginEnd="@dimen/work_fab_margin"

    android:paddingLeft="@dimen/work_mode_fab_padding"

    android:paddingRight="@dimen/work_mode_fab_padding"

    android:text="@string/work_apps_pause_btn_text" />
 
 No newline at end of file

res/values/dimens.xml

+12 −5
Original line number Diff line number Diff line
@@ -137,18 +137,25 @@ 


<!-- Floating action button inside work tab to toggle work profile -->

    <dimen name="work_fab_height">56dp</dimen>

    <dimen name="work_fab_radius">28dp</dimen>

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

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

    <dimen name="work_card_padding_horizontal">10dp</dimen>

    <dimen name="work_card_button_height">52dp</dimen>

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

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

    <dimen name="work_profile_footer_padding">20dp</dimen>

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

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

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



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

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

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

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

    <dimen name="x_icon_padding">4dp</dimen>



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

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

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

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

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

    <dimen name="rounded_button_radius">200dp</dimen>

    <dimen name="rounded_button_padding">8dp</dimen>

src/com/android/launcher3/allapps/WorkAdapterProvider.java

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ public class WorkAdapterProvider extends BaseAdapterProvider { 
        TextView title = view.findViewById(R.id.work_apps_paused_title);

        title.setText(cache.workProfileEdu);



        Button button = view.findViewById(R.id.action_btn);

        button.setText(cache.workProfileEduAccept);

    }



    /**