Merge "Support single conversation in People Space widget" (7d7f8e01) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -14484,10 +14484,11 @@ public final class Settings {
		public static final String SHOW_PEOPLE_SPACE = "show_people_space";

		/**
		* Which types of conversations to show in People Space.
		* Which types of conversation(s) to show in People Space.
		* Values are:
		* 0: All conversations (default)
		* 0: Single user-selected conversation (default)
		* 1: Priority conversations only
		* 2: All conversations
		* @hide
		*/
		public static final String PEOPLE_SPACE_CONVERSATION_TYPE =

packages/SystemUI/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -576,6 +576,7 @@
		android:launchMode="singleInstance">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
		<category android:name="android.intent.category.LAUNCHER"/>
		</intent-filter>
		</activity>

packages/SystemUI/res/drawable/people_space_activity_card.xml

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2020 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.
		-->
		<shape xmlns:android="http://schemas.android.com/apk/res/android">
		<solid android:color="?android:attr/colorAccent" />
		<corners android:radius="@dimen/people_space_widget_radius" />
		</shape>
		No newline at end of file

packages/SystemUI/res/layout/people_space_activity.xml

+9 −11

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/scroll"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@android:color/holo_blue_light">
		android:layout_height="match_parent">

		<LinearLayout
		android:id="@+id/people_space_layout"
		@@ -30,16 +29,15 @@
		android:clipChildren="false"
		android:clipToPadding="false">

		<ImageView
		android:id="@+id/people_space_cloud"
		android:layout_width="67dp"
		android:layout_height="67dp"
		<TextView
		android:id="@+id/select_conversation"
		android:text="@string/select_conversation_text"
		android:layout_width="match_parent"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:textSize="24sp"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:scaleType="fitCenter"
		android:focusable="false"
		android:paddingBottom="16dp"
		android:tint="?android:attr/colorControlNormal"
		android:src="@drawable/cloud" />
		android:paddingBottom="16dp" />

		</LinearLayout>
		</androidx.core.widget.NestedScrollView>
		No newline at end of file

packages/SystemUI/res/layout/people_space_tile_view.xml

+42 −35

Original line number	Diff line number	Diff line
		@@ -20,46 +20,53 @@
		android:orientation="vertical">

		<LinearLayout
		android:background="@drawable/people_space_tile_view_card"
		android:orientation="vertical"
		android:padding="16dp"
		android:layout_marginBottom="24dp"
		android:background="@drawable/people_space_activity_card"
		android:padding="12dp"
		android:elevation="4dp"
		android:layout_marginBottom="12dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:elevation="4dp"
		android:gravity="start">

		<ImageView
		android:id="@+id/tile_view_package_icon"
		android:layout_width="32dp"
		android:layout_height="32dp"
		android:layout_gravity="end" />
		android:id="@+id/tile_view_person_icon"
		android:layout_width="48dp"
		android:layout_height="48dp" />

		<ImageView
		android:id="@+id/tile_view_person_icon"
		android:layout_width="32dp"
		android:layout_height="32dp"
		android:layout_gravity="start" />
		android:id="@+id/tile_view_package_icon"
		android:layout_width="16dp"
		android:layout_marginStart="-8dp"
		android:layout_height="16dp" />

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<TextView
		android:id="@+id/tile_view_name"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:paddingVertical="4dp"
		android:paddingHorizontal="16dp"
		android:textSize="22sp"
		android:textColor="?android:attr/textColorPrimary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="start" />
		android:layout_height="wrap_content" />

		<TextView
		android:id="@+id/tile_view_status"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		android:paddingVertical="4dp"
		android:textSize="16sp"
		android:textColor="?android:attr/textColorSecondary"
		android:textSize="12sp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:layout_gravity="start" />
		android:ellipsize="end" />
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>
		No newline at end of file