diff options
| author | 2022-02-24 18:48:59 +0000 | |
|---|---|---|
| committer | 2022-02-24 18:48:59 +0000 | |
| commit | 56f6f2d3eaad3c46a874a8c6622fcb8614f33bdd (patch) | |
| tree | c75c2c8821657e38f1064ba64a372e0206658d29 | |
| parent | 2d82160ae9e1ecba495597566f3d57ce01534a06 (diff) | |
| parent | d28f0a854776b6f82423d4301a142aa000730c10 (diff) | |
Merge "User Switcher: Fix corner case for large names" into tm-dev am: d28f0a8547
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988753
Change-Id: Ibaaa891ed9ae1031ad84143856d7f8e2aa854450
| -rw-r--r-- | packages/SystemUI/res/layout/user_switcher_fullscreen_item.xml | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/packages/SystemUI/res/layout/user_switcher_fullscreen_item.xml b/packages/SystemUI/res/layout/user_switcher_fullscreen_item.xml index a3d9a69e73c5..60e840c0708b 100644 --- a/packages/SystemUI/res/layout/user_switcher_fullscreen_item.xml +++ b/packages/SystemUI/res/layout/user_switcher_fullscreen_item.xml @@ -13,21 +13,30 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<LinearLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical"> - <ImageView - android:id="@+id/user_switcher_icon" - android:layout_gravity="center" - android:layout_width="@dimen/bouncer_user_switcher_icon_size_plus_margin" - android:layout_height="@dimen/bouncer_user_switcher_icon_size_plus_margin" /> - <TextView - style="@style/Bouncer.UserSwitcher.Spinner.Item" - android:id="@+id/user_switcher_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@*android:color/text_color_primary_device_default_dark" - android:layout_gravity="center" /> -</LinearLayout> + + <ImageView + android:id="@+id/user_switcher_icon" + android:layout_width="@dimen/bouncer_user_switcher_icon_size_plus_margin" + android:layout_height="@dimen/bouncer_user_switcher_icon_size_plus_margin" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/user_switcher_text" + style="@style/Bouncer.UserSwitcher.Spinner.Item" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:ellipsize="end" + android:gravity="center" + android:textColor="@*android:color/text_color_primary_device_default_dark" + app:layout_constraintEnd_toEndOf="@id/user_switcher_icon" + app:layout_constraintStart_toStartOf="@id/user_switcher_icon" + app:layout_constraintTop_toBottomOf="@id/user_switcher_icon" /> +</androidx.constraintlayout.widget.ConstraintLayout> |