Merge "Adding controllers for Controls" (d31226a0) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+17 −0

Original line number	Diff line number	Diff line
		@@ -637,6 +637,23 @@
		</intent-filter>
		</activity>

		<activity android:name=".controls.management.ControlsProviderSelectorActivity"
		android:label="Controls Providers"
		android:theme="@style/Theme.SystemUI"
		android:exported="true"
		android:excludeFromRecents="true"
		android:configChanges="screenSize\|smallestScreenSize\|screenLayout\|orientation\|keyboard\|keyboardHidden"
		android:visibleToInstantApps="true">
		</activity>

		<activity android:name=".controls.management.ControlsFavoritingActivity"
		android:parentActivityName=".controls.management.ControlsProviderSelectorActivity"
		android:theme="@style/Theme.SystemUI"
		android:excludeFromRecents="true"
		android:configChanges="screenSize\|smallestScreenSize\|screenLayout\|orientation\|keyboard\|keyboardHidden"
		android:visibleToInstantApps="true">
		</activity>

		<!-- Doze with notifications, run in main sysui process for every user -->
		<service
		android:name=".doze.DozeService"

packages/SystemUI/res/layout/app_item.xml

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 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:background="?android:attr/selectableItemBackground"
		android:gravity="center_vertical"
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<LinearLayout
		android:id="@+id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="start\|center_vertical"
		android:minWidth="56dp"
		android:orientation="horizontal"
		android:paddingEnd="8dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp">
		<ImageView
		android:id="@android:id/icon"
		android:layout_width="@dimen/app_icon_size"
		android:layout_height="@dimen/app_icon_size"/>
		</LinearLayout>

		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingTop="16dp"
		android:paddingBottom="16dp">

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceListItem"/>

		</LinearLayout>

		<LinearLayout
		android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="center_vertical\|end"
		android:minWidth="64dp"
		android:orientation="vertical"/>

		</LinearLayout>
		No newline at end of file

packages/SystemUI/res/layout/control_item.xml

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		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.
		-->
		<androidx.constraintlayout.widget.ConstraintLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="100dp"
		android:padding="15dp"
		android:clickable="true"
		android:focusable="true">

		<ImageView
		android:id="@+id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent" />

		<TextView
		android:id="@+id/status"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="12sp"
		android:textColor="?android:attr/textColorPrimary"
		android:fontFamily="@*android:string/config_bodyFontFamily"
		android:paddingLeft="3dp"
		app:layout_constraintBottom_toBottomOf="@+id/icon"
		app:layout_constraintStart_toEndOf="@+id/icon" />

		<TextView
		android:id="@+id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:textColor="?android:attr/textColorPrimary"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		app:layout_constraintBottom_toTopOf="@+id/subtitle"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/icon" />

		<TextView
		android:id="@+id/subtitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="16sp"
		android:textColor="?android:attr/textColorSecondary"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent" />

		<CheckBox
		android:id="@+id/favorite"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"/>
		</androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1165,4 +1165,5 @@
		<dimen name="magnifier_up_down_controls_width">45dp</dimen>
		<dimen name="magnifier_up_down_controls_height">40dp</dimen>

		<dimen name="app_icon_size">32dp</dimen>
		</resources>

packages/SystemUI/src/com/android/systemui/controls/ControlStatus.kt

0 → 100644

+21 −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.
		*/

		package com.android.systemui.controls

		import android.service.controls.Control

		data class ControlStatus(val control: Control, val favorite: Boolean, val removed: Boolean = false)
		No newline at end of file