Merge "Add layout for 1x1 size, update 2x1" into sc-dev (14a5f1de) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_message.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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:aapt="http://schemas.android.com/aapt"
		android:viewportWidth="48"
		android:viewportHeight="48"
		android:width="48dp"
		android:height="48dp">
		<path
		android:pathData="M40 4H8C5.79 4 4.02 5.79 4.02 8L4 44l8 -8h28c2.21 0 4 -1.79 4 -4V8c0 -2.21 -1.79 -4 -4 -4zM12 18h24v4H12v-4zm16 10H12v-4h16v4zm8 -12H12v-4h24v4z"
		android:fillColor="#FF000000" />
		</vector>
		No newline at end of file

packages/SystemUI/res/drawable/ic_photo_camera.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FF000000"
		android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
		</vector>
		No newline at end of file

packages/SystemUI/res/layout/people_space_large_avatar_tile.xml

+8 −29

Original line number	Diff line number	Diff line
		@@ -28,48 +28,27 @@
		<LinearLayout
		android:orientation="horizontal"
		android:gravity="center"
		android:layout_gravity="center"
		android:paddingVertical="2dp"
		android:paddingHorizontal="8dp"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<LinearLayout
		android:background="@drawable/people_space_new_story_outline"
		android:id="@+id/person_icon_with_story"
		android:gravity="center_horizontal"
		android:layout_width="60dp"
		android:layout_height="60dp">
		<ImageView
		android:id="@+id/person_icon_inside_ring"
		android:layout_marginEnd="4dp"
		android:layout_marginStart="4dp"
		android:layout_marginBottom="4dp"
		android:layout_marginTop="4dp"
		android:layout_width="52dp"
		android:layout_height="52dp"/>
		</LinearLayout>
		<ImageView
		android:id="@+id/person_icon_only"
		android:id="@+id/person_icon"
		android:layout_width="60dp"
		android:layout_height="60dp"/>

		<ImageView
		android:id="@+id/package_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_marginStart="-20dp"
		android:layout_marginTop="22dp"/>

		android:id="@+id/availability"
		android:layout_width="10dp"
		android:layout_height="10dp"
		android:background="@drawable/circle_green_10dp"/>
		<LinearLayout
		android:orientation="vertical"
		android:paddingStart="8dp"
		android:paddingStart="4dp"
		android:gravity="top"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<ImageView
		android:id="@+id/availability"
		android:layout_width="10dp"
		android:layout_height="10dp"
		android:background="@drawable/circle_green_10dp"/>
		<TextView
		android:id="@+id/name"
		android:text="@string/empty_user_name"

packages/SystemUI/res/layout/people_space_notification_content_tile.xml

deleted100644 → 0

+0 −154

Original line number	Diff line number	Diff line
		<?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.
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<RelativeLayout
		android:background="@drawable/people_space_tile_view_card"
		android:id="@+id/item"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<include layout="@layout/punctuation_layout"/>
		<RelativeLayout
		android:gravity="start"
		android:id="@+id/column_one"
		android:paddingVertical="10dp"
		android:paddingStart="8dp"
		android:layout_width="wrap_content"
		android:layout_height="match_parent">
		<TextView
		android:id="@+id/subtext"
		android:layout_toStartOf="@+id/content_layout"
		android:layout_alignParentStart="true"
		android:layout_alignParentTop="true"
		android:gravity="top\|start"
		android:textColor="?android:attr/textColorSecondary"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textSize="12sp"
		android:maxWidth="60dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="1"
		android:ellipsize="end"/>
		<LinearLayout
		android:orientation="horizontal"
		android:id="@+id/avatar_and_app_icon"
		android:layout_alignParentBottom="true"
		android:layout_alignParentStart="true"
		android:gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		<LinearLayout
		android:id="@+id/person_icon_with_story"
		android:background="@drawable/people_space_new_story_outline"
		android:gravity="center_horizontal"
		android:layout_width="48dp"
		android:layout_height="48dp">
		<ImageView
		android:id="@+id/person_icon_inside_ring"
		android:layout_marginEnd="4dp"
		android:layout_marginStart="4dp"
		android:layout_marginBottom="4dp"
		android:layout_marginTop="4dp"
		android:layout_width="40dp"
		android:layout_height="40dp"/>
		</LinearLayout>
		<ImageView
		android:id="@+id/person_icon_only"
		android:layout_width="48dp"
		android:layout_height="48dp"/>
		<ImageView
		android:id="@id/package_icon"
		android:layout_marginStart="-16dp"
		android:layout_marginTop="18dp"
		android:paddingBottom="10dp"
		android:paddingEnd="8dp"
		android:layout_width="28dp"
		android:layout_height="32dp"/>
		</LinearLayout>
		</RelativeLayout>
		<LinearLayout
		android:id="@+id/content_layout"
		android:paddingBottom="4dp"
		android:paddingStart="4dp"
		android:paddingTop="8dp"
		android:paddingEnd="8dp"
		android:layout_alignParentEnd="true"
		android:layout_alignParentTop="true"
		android:layout_toEndOf="@id/column_one"
		android:gravity="top\|end"
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		<TextView
		android:id="@+id/content"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textColor="?android:attr/textColorPrimary"
		android:gravity="top\|end"
		android:textSize="12sp"
		android:paddingTop="2dp"
		android:paddingEnd="4dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:maxLines="2"
		android:ellipsize="end"/>
		<LinearLayout
		android:id="@+id/content_background"
		android:background="@drawable/people_space_content_background"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<ImageView
		android:id="@+id/image"
		android:adjustViewBounds="true"
		android:maxHeight="44dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:scaleType="centerCrop"/>
		</LinearLayout>
		</LinearLayout>
		<LinearLayout
		android:id="@+id/person_label"
		android:paddingBottom="10dp"
		android:paddingEnd="8dp"
		android:gravity="start\|bottom"
		android:layout_toEndOf="@id/column_one"
		android:layout_alignParentBottom="true"
		android:layout_alignParentEnd="true"
		android:layout_below="@id/content_layout"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<ImageView
		android:id="@+id/availability"
		android:layout_width="10dp"
		android:layout_height="10dp"
		android:paddingVertical="2dp"
		android:background="@drawable/circle_green_10dp"/>
		<TextView
		android:id="@+id/name"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="14sp"
		android:maxLines="1"
		android:ellipsize="end"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>
		</LinearLayout>
		</RelativeLayout>
		</LinearLayout>
		No newline at end of file

packages/SystemUI/res/layout/people_space_small_avatar_tile.xml

+75 −115

Original line number	Diff line number	Diff line
		@@ -16,29 +16,54 @@
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_gravity="center"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<RelativeLayout
		<LinearLayout
		android:background="@drawable/people_space_tile_view_card"
		android:id="@+id/item"
		android:orientation="vertical"
		android:layout_gravity="center"
		android:padding="8dp"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<RelativeLayout
		android:gravity="start"
		android:id="@+id/column_one"
		android:paddingVertical="8dp"
		android:paddingStart="8dp"
		android:layout_width="wrap_content"
		android:layout_height="match_parent">
		android:layout_height="wrap_content">
		<LinearLayout
		android:orientation="horizontal"
		android:gravity="top"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<ImageView
		android:gravity="start"
		android:id="@+id/person_icon"
		android:layout_width="56dp"
		android:layout_height="56dp"/>
		<ImageView
		android:id="@+id/availability"
		android:layout_width="10dp"
		android:layout_height="10dp"
		android:background="@drawable/circle_green_10dp"/>
		<LinearLayout
		android:orientation="vertical"
		android:gravity="top\|start"
		android:paddingStart="12dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView
		android:id="@+id/subtext"
		android:text="@string/empty_user_name"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textColor="?android:attr/textColorSecondary"
		android:textSize="12sp"
		android:paddingBottom="4dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:ellipsize="end"/>
		<LinearLayout
		android:id="@+id/content_background"
		android:background="@drawable/people_space_content_background"
		android:layout_alignParentStart="true"
		android:layout_alignParentTop="true"
		android:layout_width="60dp"
		android:layout_height="60dp">
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<ImageView
		android:id="@+id/image"
		android:gravity="center"
		@@ -46,105 +71,33 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:scaleType="centerCrop"/>
		<ImageView
		android:id="@+id/status_defined_icon"
		android:gravity="start\|top"
		android:layout_marginStart="-52dp"
		android:layout_marginTop="8dp"
		android:layout_width="18dp"
		android:layout_height="18dp"/>
		</LinearLayout>
		<LinearLayout
		android:orientation="horizontal"
		android:id="@+id/avatar_and_app_icon"
		android:layout_alignParentBottom="true"
		android:layout_alignParentStart="true"
		android:paddingStart="4dp"
		android:gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		<LinearLayout
		android:id="@+id/person_icon_with_story"
		android:background="@drawable/people_space_new_story_outline"
		android:gravity="center_horizontal"
		android:layout_width="48dp"
		android:layout_height="48dp">
		<ImageView
		android:id="@+id/person_icon_inside_ring"
		android:layout_marginEnd="4dp"
		android:layout_marginStart="4dp"
		android:layout_marginBottom="4dp"
		android:layout_marginTop="4dp"
		android:layout_width="40dp"
		android:layout_height="40dp"/>
		</LinearLayout>
		<ImageView
		android:id="@+id/person_icon_only"
		android:layout_width="48dp"
		android:layout_height="48dp"/>
		<ImageView
		android:id="@id/package_icon"
		android:layout_marginStart="-16dp"
		android:layout_marginTop="18dp"
		android:paddingBottom="10dp"
		android:paddingEnd="8dp"
		android:layout_width="28dp"
		android:layout_height="32dp"/>
		</LinearLayout>
		</RelativeLayout>
		<LinearLayout
		android:id="@+id/content_layout"
		android:paddingTop="10dp"
		android:paddingBottom="4dp"
		android:paddingHorizontal="8dp"
		android:layout_alignParentEnd="true"
		android:layout_alignParentTop="true"
		android:layout_toEndOf="@id/column_one"
		android:gravity="top\|end"
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		<TextView
		android:id="@+id/status"
		android:id="@+id/text_content"
		android:text="@string/empty_status"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="12sp"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:maxLines="2"
		android:singleLine="false"
		android:ellipsize="end"/>
		</LinearLayout>
		</LinearLayout>
		<LinearLayout
		android:id="@+id/person_label"
		android:paddingBottom="10dp"
		android:paddingEnd="8dp"
		android:gravity="start\|bottom"
		android:layout_toEndOf="@id/column_one"
		android:layout_alignParentBottom="true"
		android:layout_alignParentEnd="true"
		android:layout_below="@id/content_layout"
		android:orientation="vertical"
		android:gravity="bottom"
		android:orientation="horizontal"
		android:paddingTop="4dp"
		android:layout_weight="1"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView
		android:id="@+id/time"
		android:textColor="?android:attr/textColorSecondary"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textSize="12sp"
		android:paddingVertical="2dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="1"
		android:visibility="gone"
		android:ellipsize="end"/>
		<ImageView
		android:id="@+id/availability"
		android:layout_width="10dp"
		android:layout_height="10dp"
		android:paddingVertical="2dp"
		android:background="@drawable/circle_green_10dp"/>

		<TextView
		android:id="@+id/name"
		android:gravity="center_vertical"
		android:layout_weight="1"
		android:text="@string/empty_user_name"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="14sp"
		@@ -152,6 +105,13 @@
		android:ellipsize="end"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>
		<ImageView
		android:id="@+id/predefined_icon"
		android:gravity="end"
		android:paddingStart="6dp"
		android:layout_width="24dp"
		android:layout_height="18dp"/>
		</LinearLayout>
		</LinearLayout>
		</RelativeLayout>
		</LinearLayout>