Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update template tile to fit worse-case dimens" into sc-dev am: 6df2318f26

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15029951

Change-Id: Ia9b198a8da91cb8ff8bddc0523906e59140f9c45
This commit is contained in:
Anna Zappone
2021-06-25 11:34:56 +00:00
committed by Automerger Merge Worker
parent c7a7ae1241 6df2318f26
commit 9167eca503
3 changed files with 78 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SystemUI/res/drawable/ic_avatar_with_badge.xml Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:width="50dp"
android:height="50dp"
android:viewportWidth="50"
android:viewportHeight="50">
<path
android:pathData="M0,24C0,10.7452 10.7452,0 24,0V0C37.2548,0 48,10.7452 48,24V24C48,37.2548 37.2548,48 24,48V48C10.7452,48 0,37.2548 0,24V24Z"
android:fillColor="?androidprv:attr/colorAccentSecondary"/>
<path
android:pathData="M31.2003,19.2C31.2003,23.1764 27.9767,26.4 24.0003,26.4C20.0238,26.4 16.8003,23.1764 16.8003,19.2C16.8003,15.2235 20.0238,12 24.0003,12C27.9767,12 31.2003,15.2235 31.2003,19.2ZM28.8003,19.2C28.8003,21.851 26.6513,24 24.0003,24C21.3493,24 19.2003,21.851 19.2003,19.2C19.2003,16.549 21.3493,14.4 24.0003,14.4C26.6513,14.4 28.8003,16.549 28.8003,19.2Z"
android:fillColor="@color/people_tile_background"
android:fillType="evenOdd"/>
<path
android:pathData="M24.0003,30C16.231,30 9.6114,34.5941 7.0898,41.0305C7.7041,41.6404 8.3512,42.2174 9.0282,42.7585C10.9059,36.8492 16.7964,32.4 24.0003,32.4C31.2042,32.4 37.0947,36.8492 38.9724,42.7585C39.6494,42.2174 40.2965,41.6404 40.9108,41.0305C38.3892,34.5941 31.7696,30 24.0003,30Z"
android:fillColor="@color/people_tile_background"/>
<path
android:pathData="M40,40m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
android:fillColor="?androidprv:attr/colorAccentTertiary"/>
</vector>

58
packages/SystemUI/res/layout/people_space_placeholder_layout.xml
View File

@@ -25,23 +25,36 @@
android:id="@+id/item" android:id="@+id/item"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center" android:gravity="center"
android:layout_gravity="top" android:layout_gravity="center"
android:paddingVertical="8dp" android:paddingVertical="8dp"
android:paddingHorizontal="16dp" android:paddingHorizontal="2dp"
android:layout_width="match_parent" android:layout_width="136dp"
android:layout_height="match_parent"> android:layout_height="51dp">
<TextView
android:layout_weight="6"
android:layout_width="0dp"
android:layout_height="match_parent"/>
<LinearLayout <LinearLayout
android:layout_weight="34"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="20dp" android:gravity="start|center_vertical"
android:gravity="start|bottom" android:layout_gravity="start|center_vertical"
android:layout_width="0dp"
android:layout_height="match_parent">
<TextView
android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"/>
<ImageView <ImageView
android:background="@drawable/ic_person" android:layout_weight="1"
android:layout_width="48dp" android:gravity="start"
android:layout_height="48dp" /> android:layout_gravity="start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_avatar_with_badge"
android:adjustViewBounds="true"
android:scaleType="centerInside" />
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
@@ -54,16 +67,25 @@
android:ellipsize="end" android:ellipsize="end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
<TextView <TextView
android:text="@string/empty_status" android:layout_weight="52"
android:textColor="?android:attr/textColorPrimary" android:layout_width="0dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
android:textSize="12sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="3" android:ellipsize="end"
android:ellipsize="end" /> android:maxLines="2"
android:text="@string/empty_status"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
android:textColor="?android:attr/textColorPrimary"
android:textSize="12sp" />
<TextView
android:layout_weight="6"
android:layout_width="0dp"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
packages/SystemUI/res/values/strings.xml
View File

@@ -2932,7 +2932,7 @@
<string name="audio_status">Listening</string> <string name="audio_status">Listening</string>
<!-- Status text on the Conversation widget for playing a game [CHAR LIMIT=20] --> <!-- Status text on the Conversation widget for playing a game [CHAR LIMIT=20] -->
<string name="game_status">Playing</string> <string name="game_status">Playing</string>
<!-- Empty user name before user has selected a friend for their Conversation widget [CHAR LIMIT=20] --> <!-- Empty user name before user has selected a friend for their Conversation widget [CHAR LIMIT=10] -->
<string name="empty_user_name">Friends</string> <string name="empty_user_name">Friends</string>
<!-- Empty status shown before user has selected a friend for their Conversation widget [CHAR LIMIT=20] --> <!-- Empty status shown before user has selected a friend for their Conversation widget [CHAR LIMIT=20] -->
<string name="empty_status">Let’s chat tonight!</string> <string name="empty_status">Let’s chat tonight!</string>