Merge "User Switcher: Fix corner case for large names" into tm-dev

This commit is contained in:
Aaron Liu
2022-02-24 18:17:08 +00:00
committed by Android (Google) Code Review

View File

@@ -13,21 +13,30 @@
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License. ~ limitations under the License.
--> -->
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<ImageView
android:id="@+id/user_switcher_icon" <ImageView
android:layout_gravity="center" android:id="@+id/user_switcher_icon"
android:layout_width="@dimen/bouncer_user_switcher_icon_size_plus_margin" android:layout_width="@dimen/bouncer_user_switcher_icon_size_plus_margin"
android:layout_height="@dimen/bouncer_user_switcher_icon_size_plus_margin" /> android:layout_height="@dimen/bouncer_user_switcher_icon_size_plus_margin"
<TextView app:layout_constraintEnd_toEndOf="parent"
style="@style/Bouncer.UserSwitcher.Spinner.Item" app:layout_constraintStart_toStartOf="parent"
android:id="@+id/user_switcher_text" app:layout_constraintTop_toTopOf="parent" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" <TextView
android:textColor="@*android:color/text_color_primary_device_default_dark" android:id="@+id/user_switcher_text"
android:layout_gravity="center" /> style="@style/Bouncer.UserSwitcher.Spinner.Item"
</LinearLayout> 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>