aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brandon Dayauon
2022-04-06 20:41:24 +00:00
committed by Android (Google) Code Review
parent 510a818521 d20011be15
commit e3589debfd
4 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
res/layout/work_apps_edu.xml
View File

@@ -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:background="@drawable/rounded_action_button"
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>

2
res/layout/work_mode_fab.xml
View File

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

17
res/values/dimens.xml
View File

@@ -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>

2
src/com/android/launcher3/allapps/WorkAdapterProvider.java
View File

@@ -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);
}
/**