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

Commit e1fd8d2c authored by Mady Mellor's avatar Mady Mellor
Browse files

Update all of the text views in bubbles to use a diff font 

This is gated by a flag which is checked within the TypefaceUtils
method. Text updated:
- overflow empty states; overflow item names
- flyout text (bubble bar - in launcher CL, bubble stack view)
- manage menu text (bubble bar, bubble stack view)
- user education text (bubble bar, bubble stack view)

Flag: com.android.wm.shell.enable_gsf
Test: manual - enable the flag and inspect the text of all
               the UI elements
Bug: 379159675
Change-Id: I71e0eae27e5f2b648eaf2ecae8969c79527863fc
parent 620d3940

libs/WindowManager/Shell/res/layout/bubble_bar_manage_education.xml

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
        android:src="@drawable/pip_ic_settings"/>



    <TextView

        android:id="@+id/education_manage_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/bubble_popup_text_margin"
@@ -45,6 +46,7 @@ 
        android:text="@string/bubble_bar_education_manage_title"/>



    <TextView

        android:id="@+id/education_manage_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/bubble_popup_text_margin"

libs/WindowManager/Shell/res/layout/bubble_bar_stack_education.xml

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
        android:src="@drawable/ic_floating_landscape"/>



    <TextView

        android:id="@+id/education_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/bubble_popup_text_margin"
@@ -45,6 +46,7 @@ 
        android:text="@string/bubble_bar_education_stack_title"/>



    <TextView

        android:id="@+id/education_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/bubble_popup_text_margin"

libs/WindowManager/Shell/res/layout/bubble_manage_menu.xml

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
            android:tint="@color/bubbles_icon_tint"/>



        <TextView

            android:id="@+id/manage_dismiss"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"
@@ -67,6 +68,7 @@ 
            android:tint="@color/bubbles_icon_tint"/>



        <TextView

            android:id="@+id/manage_dont_bubble"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; 
import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES;

import static com.android.wm.shell.shared.TypefaceUtils.setTypeface;



import android.annotation.NonNull;

import android.annotation.SuppressLint;
@@ -71,6 +72,7 @@ import com.android.wm.shell.Flags; 
import com.android.wm.shell.R;

import com.android.wm.shell.common.AlphaOptimizedButton;

import com.android.wm.shell.shared.TriangleShape;

import com.android.wm.shell.shared.TypefaceUtils;

import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper;

import com.android.wm.shell.taskview.TaskView;
@@ -548,6 +550,7 @@ public class BubbleExpandedView extends LinearLayout { 
        mManageButton = (AlphaOptimizedButton) LayoutInflater.from(ctw).inflate(

                R.layout.bubble_manage_button, this /* parent */, false /* attach */);

        addView(mManageButton);

        setTypeface(mManageButton, TypefaceUtils.FontFamily.GSF_LABEL_LARGE);

        mManageButton.setVisibility(visibility);

        setManageClickListener();

        post(() -> {

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleFlyoutView.java

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import androidx.annotation.Nullable; 


import com.android.wm.shell.R;

import com.android.wm.shell.shared.TriangleShape;

import com.android.wm.shell.shared.TypefaceUtils;



/**

 * Flyout view that appears as a 'chat bubble' alongside the bubble stack. The flyout can visually
@@ -165,8 +166,10 @@ public class BubbleFlyoutView extends FrameLayout { 
        LayoutInflater.from(context).inflate(R.layout.bubble_flyout, this, true);

        mFlyoutTextContainer = findViewById(R.id.bubble_flyout_text_container);

        mSenderText = findViewById(R.id.bubble_flyout_name);

        TypefaceUtils.setTypeface(mSenderText, TypefaceUtils.FontFamily.GSF_LABEL_LARGE);

        mSenderAvatar = findViewById(R.id.bubble_flyout_avatar);

        mMessageText = mFlyoutTextContainer.findViewById(R.id.bubble_flyout_text);

        TypefaceUtils.setTypeface(mMessageText, TypefaceUtils.FontFamily.GSF_BODY_MEDIUM);



        final Resources res = getResources();

        mFlyoutPadding = res.getDimensionPixelSize(R.dimen.bubble_flyout_padding_x);