Merge "Shortcut/people icon horizontal layout polish" into tm-qpr-dev am: 50eef33f20 am: e6b8134769 am: 798b89252b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21980491 Change-Id: I884b6e06606deff459cedaa83ad538e2bd3194bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -665,8 +665,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
|
|||||||
getPaddingBottom());
|
getPaddingBottom());
|
||||||
}
|
}
|
||||||
// only apply two line for all_apps
|
// only apply two line for all_apps
|
||||||
if (FeatureFlags.ENABLE_TWOLINE_ALLAPPS.get() && (mLastOriginalText != null)
|
if (((FeatureFlags.ENABLE_TWOLINE_ALLAPPS.get() && mDisplay == DISPLAY_ALL_APPS)
|
||||||
&& (mDisplay == DISPLAY_ALL_APPS)) {
|
|| (FeatureFlags.ENABLE_TWOLINE_DEVICESEARCH.get()
|
||||||
|
&& mDisplay == DISPLAY_SEARCH_RESULT)) && (mLastOriginalText != null)) {
|
||||||
CharSequence modifiedString = modifyTitleToSupportMultiLine(
|
CharSequence modifiedString = modifyTitleToSupportMultiLine(
|
||||||
MeasureSpec.getSize(widthMeasureSpec) - getCompoundPaddingLeft()
|
MeasureSpec.getSize(widthMeasureSpec) - getCompoundPaddingLeft()
|
||||||
- getCompoundPaddingRight(),
|
- getCompoundPaddingRight(),
|
||||||
|
|||||||
Reference in New Issue
Block a user