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

Commit 2174b0ad authored by helencheuk's avatar helencheuk
Browse files

Update BubbleTextView height to match parent so focus outline drawn could be fully displayed 

Design doc: go/launcher-focus-outline
Before: BubbleTextView height is larger than its parent, outline is cropped
https://screenshot.googleplex.com/dYXjWAHS4VzPQdJ
After: BubbleTextView has the same height as its parent Prediction Row, outline is fully shown
https://screenshot.googleplex.com/3eMxPwxiHs9JTTq

Bug: 310953377
Test: Manual
Flag: ACONFIG com.android.launcher3.enable_focus_outline Development
Change-Id: I7bfa4da3b67b4a4abc4dfe9df560dda8d7e9b1bd
parent 1a0c6844

quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Build; 
import android.util.AttributeSet;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.widget.LinearLayout;

import android.widget.LinearLayout;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;
@@ -31,6 +32,7 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.BubbleTextView;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;

import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;

import com.android.launcher3.Flags;

import com.android.launcher3.R;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.FloatingHeaderRow;

import com.android.launcher3.allapps.FloatingHeaderRow;
@@ -199,8 +201,12 @@ public class PredictionRowView<T extends Context & ActivityContext> 
                icon.setOnFocusChangeListener(mFocusHelper);

                icon.setOnFocusChangeListener(mFocusHelper);





                LayoutParams lp = (LayoutParams) icon.getLayoutParams();

                LayoutParams lp = (LayoutParams) icon.getLayoutParams();

                if (Flags.enableFocusOutline()) {

                    lp.height = ViewGroup.LayoutParams.MATCH_PARENT;

                } else {

                    // Ensure the all apps icon height matches the workspace icons in portrait mode.

                    // Ensure the all apps icon height matches the workspace icons in portrait mode.

                    lp.height = mActivityContext.getDeviceProfile().allAppsCellHeightPx;

                    lp.height = mActivityContext.getDeviceProfile().allAppsCellHeightPx;

                }

                lp.width = 0;

                lp.width = 0;

                lp.weight = 1;

                lp.weight = 1;

                addView(icon);

                addView(icon);