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

Commit e5142c5c authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

changed name and dimensions of work_mode_toggle button, changed outline to... 

changed name and dimensions of work_mode_toggle button, changed outline to surface for the (x) icon..

Fixed padding issue (tightness) between Personal/WorkTabs/EduDialog
Aligned Work Toggle button to be the same with the workTabs/eduCard
raised button up 20dp to align with specs

Fixed issue where allApps apps invade the tabs. Fixed RTL issues where it wasn't going RTL.
Fixed RTL issue for the workfab button where there was no margin on the left side of the button
Added DeviceProfile to constructor

Bug: 200810328
Bug: 224731300
Test:
	Before: https://screenshot.googleplex.com/6sRgNZQz4wKYn5n
	After: https://screenshot.googleplex.com/8hBLyDiMbMH9tn2
	After(showingLayoutBounds): https://screenshot.googleplex.com/MuVUXCegukAMzSr

Change-Id: Ibac3f5b8fe7d877c2f54a2c87f4393c1a91dc806
parent fd64b4f2

res/drawable/rounded_action_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,10 +18,11 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <solid android:color="?androidprv:attr/colorSurfaceVariant" />

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

    <stroke

        android:width="1dp"

        android:color="?androidprv:attr/colorAccentPrimaryVariant" />

        android:color="?androidprv:attr/colorSurfaceVariant" />

    <padding

        android:left="@dimen/rounded_button_padding"

        android:right="@dimen/rounded_button_padding" />

res/layout/work_apps_edu.xml

+10 −11
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
<com.android.launcher3.allapps.WorkEduCard xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="8dp"

    android:layout_marginTop="@dimen/work_edu_card_margin"

    android:layout_marginBottom="@dimen/work_edu_card_bottom_margin"

    android:gravity="center">



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -36,30 +36,29 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/work_card_margin"

            android:layout_marginRight="@dimen/work_card_margin"

            android:layout_marginEnd="@dimen/work_card_margin"

            android:text="@string/work_profile_edu_work_apps"

            android:textDirection="locale"

            android:textSize="18sp" />

        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="@dimen/padded_rounded_button_height"

            android:orientation="horizontal"

            >

            android:orientation="horizontal">

            <FrameLayout

                android:layout_width="@dimen/rounded_button_width"

                android:layout_height="@dimen/rounded_button_width"

                android:layout_alignParentEnd="true"

                android:background="@drawable/rounded_action_button"

                android:padding="@dimen/rounded_button_padding"

                android:layout_alignParentRight="true">

                android:padding="@dimen/rounded_button_padding">

                <ImageButton

                    android:id="@+id/action_btn"

                    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" />

                    android:padding="@dimen/x_icon_padding"

                    android:src="@drawable/ic_remove_no_shadow" />

            </FrameLayout>

        </RelativeLayout>



    </RelativeLayout>

res/layout/work_mode_fab.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
    android:layout_width="wrap_content"

    android:gravity="center"

    android:includeFontPadding="false"

    android:textDirection="locale"

    android:drawableTint="@color/all_apps_tab_text"

    android:textColor="@color/all_apps_tab_text"

    android:textSize="14sp"

    android:background="@drawable/work_apps_toggle_background"

    android:drawablePadding="8dp"

    android:drawableStart="@drawable/ic_corp_off"

    android:layout_marginBottom="@dimen/work_fab_margin"

    android:layout_marginEnd="@dimen/work_fab_margin"

    android:layout_marginBottom="@dimen/work_fab_margin_bottom"

    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

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
    <dimen name="all_apps_height_extra">6dp</dimen>

    <dimen name="all_apps_bottom_sheet_horizontal_padding">0dp</dimen>

    <dimen name="all_apps_paged_view_top_padding">40dp</dimen>

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



    <!-- The size of corner radius of the arrow in the arrow toast. -->

    <dimen name="arrow_toast_corner_radius">2dp</dimen>
@@ -148,10 +149,12 @@ 
    <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_fab_margin_bottom">20dp</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">16dp</dimen>

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



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

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

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ 
    <string name="work_apps_paused_edu_accept">Got it</string>



    <!-- button string shown pause work profile -->

    <string name="work_apps_pause_btn_text">Turn off work apps</string>

    <string name="work_apps_pause_btn_text">Pause work apps</string>

    <!-- button string shown enable work profile -->

    <string name="work_apps_enable_btn_text">Turn on work apps</string>