Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 898bd17d authored by Yalan Yiue's avatar Yalan Yiue Committed by Automerger Merge Worker
Browse files

Merge "[Partial Screensharing] Permission Dialog VisD polish" into tm-qpr-dev... 

Merge "[Partial Screensharing] Permission Dialog VisD polish" into tm-qpr-dev am: 0daf00ed am: d5b592b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20520331



Change-Id: I4cec12448aa683552512d97e549c2a8b35ba272a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e87964fa d5b592b0

packages/SystemUI/res/drawable/screenrecord_options_spinner_popup_background.xml

0 → 100644
+21 −0
Original line number Original line 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 Original line 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 Original line Diff line number Diff line
@@ -16,7 +16,8 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    android:orientation="vertical"

    android:paddingBottom="@dimen/screenrecord_options_padding_bottom">

    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"
@@ -72,7 +73,7 @@ 
            android:gravity="center_vertical"

            android:gravity="center_vertical"

            android:text="@string/screenrecord_taps_label"

            android:text="@string/screenrecord_taps_label"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:fontFamily="@*android:string/config_bodyFontFamily"

            android:textColor="?android:attr/textColorPrimary"

            android:textColor="?android:attr/textColorPrimary"

            android:contentDescription="@string/screenrecord_taps_label"/>

            android:contentDescription="@string/screenrecord_taps_label"/>

        <Switch

        <Switch

packages/SystemUI/res/layout/screen_share_dialog.xml

+17 −13
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




<!-- Scrollview is necessary to fit everything in landscape layout -->

<!-- Scrollview is necessary to fit everything in landscape layout -->

<ScrollView  xmlns:android="http://schemas.android.com/apk/res/android"

<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:id="@+id/screen_share_permission_dialog"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent">
@@ -32,10 +32,11 @@ 
        android:gravity="center_horizontal">

        android:gravity="center_horizontal">





        <ImageView

        <ImageView

            android:id="@+id/screen_share_dialog_icon"

            android:layout_width="@dimen/screenrecord_logo_size"

            android:layout_width="@dimen/screenrecord_logo_size"

            android:layout_height="@dimen/screenrecord_logo_size"

            android:layout_height="@dimen/screenrecord_logo_size"

            android:src="@drawable/ic_screenrecord"

            android:src="@drawable/ic_media_projection_permission"

            android:tint="@color/screenrecord_icon_color"

            android:tint="?androidprv:attr/colorAccentPrimary"

            android:importantForAccessibility="no"/>

            android:importantForAccessibility="no"/>

        <TextView

        <TextView

            android:id="@+id/screen_share_dialog_title"

            android:id="@+id/screen_share_dialog_title"
@@ -43,34 +44,37 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:layout_marginTop="22dp"

            android:layout_marginTop="@dimen/screenrecord_title_margin_top"

            android:layout_marginBottom="15dp"/>

            android:gravity="center"/>

        <Spinner

        <Spinner

            android:id="@+id/screen_share_mode_spinner"

            android:id="@+id/screen_share_mode_spinner"

            android:layout_width="320dp"

            android:layout_width="match_parent"

            android:layout_height="72dp"

            android:layout_height="@dimen/screenrecord_spinner_height"

            android:layout_marginTop="24dp"

            android:layout_marginTop="@dimen/screenrecord_spinner_margin"

            android:layout_marginBottom="24dp" />

            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

        <ViewStub

            android:id="@+id/options_stub"

            android:id="@+id/options_stub"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content"/>

        <TextView

        <TextView

            android:id="@+id/text_warning"

            android:id="@+id/text_warning"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/screenrecord_description"

            android:text="@string/screenrecord_description"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:textColorSecondary"

            android:textColor="?android:textColorSecondary"

            android:gravity="start"

            android:gravity="start"

            android:layout_marginBottom="20dp"/>

            android:lineHeight="@dimen/screenrecord_warning_line_height"/>





        <!-- Buttons -->

        <!-- Buttons -->

        <LinearLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:orientation="horizontal"

            android:layout_marginTop="36dp">

            android:layout_marginTop="@dimen/screenrecord_buttons_margin_top">

            <TextView

            <TextView

                android:id="@+id/button_cancel"

                android:id="@+id/button_cancel"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

packages/SystemUI/res/layout/screen_share_dialog_spinner_item_text.xml

0 → 100644
+27 −0
Original line number Original line 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