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

Commit 0a25b413 authored by Yunfan Chen's avatar Yunfan Chen Committed by Automerger Merge Worker
Browse files

Merge "Move ImmersiveModeConfirmation related resources to sysUi (5/n)" into... 

Merge "Move ImmersiveModeConfirmation related resources to sysUi (5/n)" into udc-qpr-dev am: 4aaf6ab2 am: a3155b96

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



Change-Id: Icb3ff54ac59c2abe3aa62ba5bf34568467fe8053
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54b1e487 a3155b96

packages/SystemUI/res/drawable/ic_expand_more_48dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2023 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.

-->

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

        android:width="48.0dp"

        android:height="48.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M33.17,17.17L24.0,26.34l-9.17,-9.17L12.0,20.0l12.0,12.0 12.0,-12.0z"/>

</vector>

packages/SystemUI/res/drawable/immersive_cling_bg_circ.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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="oval" >



    <solid android:color="@android:color/white" />



    <size

        android:height="56dp"

        android:width="56dp" />



</shape>

packages/SystemUI/res/drawable/immersive_cling_light_bg_circ.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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="oval" >



    <solid android:color="#80ffffff" />



    <size

        android:height="76dp"

        android:width="76dp" />



</shape>

packages/SystemUI/res/layout/immersive_mode_cling.xml

0 → 100644
+91 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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.

-->

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:paddingBottom="24dp">



    <FrameLayout

            android:id="@+id/immersive_cling_chevron"

            android:layout_width="76dp"

            android:layout_height="76dp"

            android:layout_marginTop="-24dp"

            android:layout_centerHorizontal="true">



        <ImageView

                android:id="@+id/immersive_cling_back_bg_light"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:scaleType="center"

                android:src="@drawable/immersive_cling_light_bg_circ" />



        <ImageView

                android:id="@+id/immersive_cling_back_bg"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:scaleType="center"

                android:src="@drawable/immersive_cling_bg_circ" />



        <ImageView

                android:id="@+id/immersive_cling_ic_expand_more"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:paddingTop="8dp"

                android:scaleType="center"

                android:src="@drawable/ic_expand_more_48dp"/>

    </FrameLayout>



    <TextView

            android:id="@+id/immersive_cling_title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/immersive_cling_chevron"

            android:paddingEnd="48dp"

            android:paddingStart="48dp"

            android:paddingTop="40dp"

            android:text="@string/immersive_cling_title"

            android:textColor="@android:color/white"

            android:textSize="24sp" />



    <TextView

            android:id="@+id/immersive_cling_description"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/immersive_cling_title"

            android:paddingEnd="48dp"

            android:paddingStart="48dp"

            android:paddingTop="12.6dp"

            android:text="@string/immersive_cling_description"

            android:textColor="@android:color/white"

            android:textSize="16sp" />



    <Button

            android:id="@+id/ok"

            style="@android:style/Widget.Material.Button.Borderless"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentEnd="true"

            android:layout_below="@+id/immersive_cling_description"

            android:layout_marginEnd="40dp"

            android:layout_marginTop="18dp"

            android:paddingEnd="8dp"

            android:paddingStart="8dp"

            android:text="@string/immersive_cling_positive"

            android:textColor="@android:color/white"

            android:textSize="14sp" />



</RelativeLayout>

packages/SystemUI/res/values-land/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
    <dimen name="volume_tool_tip_top_margin">12dp</dimen>

    <dimen name="volume_row_slider_height">128dp</dimen>



    <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->

    <dimen name="immersive_mode_cling_width">380dp</dimen>



    <dimen name="controls_activity_view_top_offset">25dp</dimen>



    <dimen name="biometric_dialog_button_negative_max_width">140dp</dimen>