Merge "[Partial Screensharing] Permission Dialog VisD polish" into tm-qpr-dev (0daf00ed) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/screenrecord_options_spinner_popup_background.xml

0 → 100644

+21 −0

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

packages/SystemUI/res/drawable/screenshare_options_spinner_background.xml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2022 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.
		-->
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:paddingMode="stack">
		<item>
		<shape android:shape="rectangle">
		<corners android:radius="@dimen/screenrecord_spinner_background_radius" />
		<stroke
		android:width="1dp"
		android:color="?androidprv:attr/textColorTertiary" />
		<solid android:color="@android:color/transparent"/>
		</shape>
		</item>
		<item
		android:drawable="@drawable/ic_ksh_key_down"
		android:gravity="end\|center_vertical"
		android:textColor="?androidprv:attr/textColorPrimary"
		android:width="@dimen/screenrecord_spinner_arrow_size"
		android:height="@dimen/screenrecord_spinner_arrow_size"
		android:end="20dp" />
		</layer-list>
		No newline at end of file

packages/SystemUI/res/layout/screen_record_options.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">
		android:orientation="vertical"
		android:paddingBottom="@dimen/screenrecord_options_padding_bottom">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -72,7 +73,7 @@
		android:gravity="center_vertical"
		android:text="@string/screenrecord_taps_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		android:fontFamily="@*android:string/config_bodyFontFamily"
		android:textColor="?android:attr/textColorPrimary"
		android:contentDescription="@string/screenrecord_taps_label"/>
		<Switch

packages/SystemUI/res/layout/screen_share_dialog.xml

+17 −13

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

		<!-- Scrollview is necessary to fit everything in landscape layout -->
		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:id="@+id/screen_share_permission_dialog"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		@@ -32,10 +32,11 @@
		android:gravity="center_horizontal">

		<ImageView
		android:id="@+id/screen_share_dialog_icon"
		android:layout_width="@dimen/screenrecord_logo_size"
		android:layout_height="@dimen/screenrecord_logo_size"
		android:src="@drawable/ic_screenrecord"
		android:tint="@color/screenrecord_icon_color"
		android:src="@drawable/ic_media_projection_permission"
		android:tint="?androidprv:attr/colorAccentPrimary"
		android:importantForAccessibility="no"/>
		<TextView
		android:id="@+id/screen_share_dialog_title"
		@@ -43,34 +44,37 @@
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		android:layout_marginTop="22dp"
		android:layout_marginBottom="15dp"/>
		android:layout_marginTop="@dimen/screenrecord_title_margin_top"
		android:gravity="center"/>
		<Spinner
		android:id="@+id/screen_share_mode_spinner"
		android:layout_width="320dp"
		android:layout_height="72dp"
		android:layout_marginTop="24dp"
		android:layout_marginBottom="24dp" />
		android:layout_width="match_parent"
		android:layout_height="@dimen/screenrecord_spinner_height"
		android:layout_marginTop="@dimen/screenrecord_spinner_margin"
		android:layout_marginBottom="@dimen/screenrecord_spinner_margin"
		android:gravity="center_vertical"
		android:background="@drawable/screenshare_options_spinner_background"
		android:popupBackground="@drawable/screenrecord_options_spinner_popup_background"/>
		<ViewStub
		android:id="@+id/options_stub"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>
		<TextView
		android:id="@+id/text_warning"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/screenrecord_description"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:textColorSecondary"
		android:gravity="start"
		android:layout_marginBottom="20dp"/>
		android:lineHeight="@dimen/screenrecord_warning_line_height"/>

		<!-- Buttons -->
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginTop="36dp">
		android:layout_marginTop="@dimen/screenrecord_buttons_margin_top">
		<TextView
		android:id="@+id/button_cancel"
		android:layout_width="wrap_content"

packages/SystemUI/res/layout/screen_share_dialog_spinner_item_text.xml

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2022 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.
		-->
		<TextView xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:id="@android:id/text1"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="?androidprv:attr/textColorOnAccent"
		android:singleLine="true"
		android:layout_width="match_parent"
		android:layout_height="@dimen/screenrecord_spinner_height"
		android:gravity="center_vertical"
		android:ellipsize="marquee"
		android:paddingStart="@dimen/screenrecord_spinner_text_padding_start"
		android:paddingEnd="@dimen/screenrecord_spinner_text_padding_end"/>
		No newline at end of file