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

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

Merge "Add maxWidth to pause work app button and ellipsize at the end" into main

parents 5ab9a57e 602c43e9
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -37,11 +37,14 @@
        android:id="@+id/pause_text"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:maxWidth="@dimen/work_fab_width"
        android:textColor="@color/work_fab_icon_color"
        android:textSize="14sp"
        android:includeFontPadding="false"
        android:textDirection="locale"
        android:text="@string/work_apps_pause_btn_text"
        android:layout_marginStart="@dimen/work_fab_text_start_margin"
        android:ellipsize="end"
        android:maxLines="1"
        style="@style/TextHeadline"/>
</com.android.launcher3.allapps.WorkModeSwitch>
+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@
    <dimen name="work_fab_icon_size">24dp</dimen>
    <dimen name="work_fab_text_start_margin">8dp</dimen>
    <dimen name="work_card_padding_horizontal">10dp</dimen>
    <dimen name="work_fab_width">214dp</dimen>
    <dimen name="work_card_button_height">52dp</dimen>
    <dimen name="work_fab_margin">16dp</dimen>
    <dimen name="work_fab_margin_bottom">20dp</dimen>
+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@
    <!-- button string shown to dismiss work tab education -->
    <string name="work_apps_paused_edu_accept">Got it</string>

    <!-- button string shown pause work profile -->
    <!-- button string shown pause work profile [CHAR LIMIT=28] -->
    <string name="work_apps_pause_btn_text">Pause work apps</string>
    <!-- button string shown enable work profile -->
    <string name="work_apps_enable_btn_text">Unpause</string>