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

Commit 3b5f0797 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Wrap shortcuts to second line" into ub-launcher3-rvc-dev am: 027d5a0e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11917348

Change-Id: I7175a6a73aa0070d7d91981b07531f4505f460d5
parents ebf070bc 027d5a0e

res/layout/system_shortcut.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:theme="@style/PopupItem" >



    <com.android.launcher3.BubbleTextView

        style="@style/BaseIcon"

        style="@style/BaseIconUnBounded"

        android:id="@+id/bubble_text"

        android:background="?android:attr/selectableItemBackground"

        android:gravity="start|center_vertical"
@@ -30,6 +30,7 @@ 
        android:paddingStart="@dimen/deep_shortcuts_text_padding_start"

        android:paddingEnd="@dimen/popup_padding_end"

        android:textSize="14sp"

        android:maxLines="2"

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

        launcher:iconDisplay="shortcut_popup"

        launcher:layoutHorizontal="true"

res/values/styles.xml

+7 −4
Original line number Diff line number Diff line
@@ -194,21 +194,24 @@ 
        <item name="disabledIconAlpha">.54</item>

    </style>



    <!-- Base theme for BubbleTextView and sub classes -->

    <style name="BaseIcon" parent="@android:style/TextAppearance.DeviceDefault">



    <style name="BaseIconUnBounded" parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_gravity">center</item>

        <item name="android:focusable">true</item>

        <item name="android:gravity">center_horizontal</item>

        <item name="android:lines">1</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:defaultFocusHighlightEnabled">false</item>



        <!-- No shadows in the base theme -->

        <item name="android:shadowRadius">0</item>

    </style>



    <!-- Base theme for BubbleTextView and sub classes -->

    <style name="BaseIcon" parent="BaseIconUnBounded">

        <item name="android:lines">1</item>

    </style>



    <!-- Icon displayed on the workspace -->

    <style name="BaseIcon.Workspace" >

        <item name="android:shadowRadius">2.0</item>