Merge "Implement Task Manager UI" (e068cd55) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -512,6 +512,11 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String DEFAULT_QR_CODE_SCANNER = "default_qr_code_scanner";

		/**
		* (boolean) Whether the task manager entrypoint is enabled.
		*/
		public static final String TASK_MANAGER_ENABLED = "task_manager_enabled";

		private SystemUiDeviceConfigFlags() {
		}
		}

packages/SystemUI/res/drawable/ic_list.xml

0 → 100644

+42 −0

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.
		-->

		<!-- Remove when Fgs manager tile is removed -->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="48dp"
		android:height="48dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:pathData="M2,4h4v4h-4z"
		android:fillColor="#000000"/>
		<path
		android:pathData="M8,4h14v4h-14z"
		android:fillColor="#000000"/>
		<path
		android:pathData="M2,10h4v4h-4z"
		android:fillColor="#000000"/>
		<path
		android:pathData="M8,10h14v4h-14z"
		android:fillColor="#000000"/>
		<path
		android:pathData="M2,16h4v4h-4z"
		android:fillColor="#000000"/>
		<path
		android:pathData="M8,16h14v4h-14z"
		android:fillColor="#000000"/>
		</vector>

packages/SystemUI/res/layout/fgs_manager_app_item.xml

0 → 100644

+57 −0

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="wrap_content"
		android:layout_marginBottom="32dp"
		android:orientation="horizontal"
		android:gravity="center">

		<ImageView
		android:id="@+id/fgs_manager_app_item_icon"
		android:layout_width="28dp"
		android:layout_height="28dp"
		android:layout_marginRight="12dp" />

		<LinearLayout
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="wrap_content"
		android:orientation="vertical">
		<TextView
		android:id="@+id/fgs_manager_app_item_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="start"
		style="@style/TextAppearance.Dialog.Body" />
		<TextView
		android:id="@+id/fgs_manager_app_item_duration"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="start"
		style="@style/FgsManagerAppDuration" />
		</LinearLayout>

		<Button
		android:id="@+id/fgs_manager_app_item_stop_button"
		android:layout_width="wrap_content"
		android:layout_height="48dp"
		android:text="@string/fgs_manager_app_item_stop_button_label"
		android:layout_marginLeft="12dp"
		style="?android:attr/buttonBarNeutralButtonStyle" />
		</LinearLayout>

packages/SystemUI/res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@

		<!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
		<string name="quick_settings_tiles_stock" translatable="false">
		internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded
		internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,fgsmanager
		</string>

		<!-- The tiles to display in QuickSettings -->

packages/SystemUI/res/values/dimens.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1295,4 +1295,6 @@
		<!-- ************************************************************************* -->

		<dimen name="keyguard_unfold_translation_x">16dp</dimen>

		<dimen name="fgs_manager_min_width_minor">100%</dimen>
		</resources>