Merge "Controls in QS" into sc-dev (01ab7bcd) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -751,6 +751,17 @@
		android:visibleToInstantApps="true">
		</activity>

		<activity android:name=".controls.ui.ControlsActivity"
		android:label="@string/quick_controls_title"
		android:theme="@style/Theme.ControlsActivity"
		android:excludeFromRecents="true"
		android:showWhenLocked="true"
		android:showForAllUsers="true"
		android:launchMode="singleInstance"
		android:configChanges="screenSize\|smallestScreenSize\|screenLayout\|orientation\|keyboard\|keyboardHidden"
		android:visibleToInstantApps="true">
		</activity>

		<receiver android:name=".controls.management.ControlsRequestReceiver"
		android:exported="true">
		<intent-filter>

deleted100644 → 0

+0 −21

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.
		-->
		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<solid android:color="?android:attr/colorBackground" />
		<corners android:radius="@dimen/notification_corner_radius" />
		</shape>

+3 −4

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@
		android:id="@+id/control_detail_root"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginTop="@dimen/controls_activity_view_top_offset"
		android:orientation="vertical">
		android:orientation="vertical"
		android:background="@android:color/black">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -30,7 +30,7 @@
		<ImageView
		android:id="@+id/control_detail_close"
		android:contentDescription="@string/accessibility_desc_close"
		android:src="@drawable/ic_close"
		android:src="@drawable/ic_arrow_back"
		android:background="?android:attr/selectableItemBackgroundBorderless"
		android:tint="@color/control_primary_text"
		android:layout_width="48dp"
		@@ -56,7 +56,6 @@
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:background="@android:color/black"
		android:orientation="vertical" />
		</LinearLayout>

+1 −4

Original line number	Diff line number	Diff line
		@@ -20,11 +20,8 @@
		android:id="@+id/control_detail_root"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginVertical="@dimen/controls_activity_view_top_offset"
		android:layout_marginHorizontal="@dimen/controls_activity_view_side_offset"
		android:padding="8dp"
		android:orientation="vertical"
		android:background="@drawable/controls_dialog_bg">
		android:background="@android:color/black">

		<com.android.systemui.globalactions.MinHeightScrollView
		android:layout_width="match_parent"

+14 −1

Original line number	Diff line number	Diff line
		@@ -25,8 +25,21 @@

		<!-- make sure the header stays centered in the layout by adding a spacer -->
		<Space
		android:id="@+id/controls_spacer"
		android:layout_width="@dimen/controls_header_menu_size"
		android:layout_height="1dp" />
		android:layout_height="1dp"
		android:visibility="gone" />

		<ImageView
		android:id="@+id/controls_close"
		android:contentDescription="@string/accessibility_desc_close"
		android:src="@drawable/ic_close"
		android:background="?android:attr/selectableItemBackgroundBorderless"
		android:tint="@color/control_primary_text"
		android:layout_width="@dimen/controls_header_menu_size"
		android:layout_height="@dimen/controls_header_menu_size"
		android:padding="12dp"
		android:visibility="gone" />
		<!-- need to keep this outer view in order to have a correctly sized anchor
		for the dropdown menu, as well as dropdown background in the right place -->
		<LinearLayout