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

Commit aec26c4f authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Mariia Sandrikova
Browse files

DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control." 

Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I318b89b87cd3b05a3f3dcd428e3d80fe81465011
parent 103cb7d5

libs/WindowManager/Shell/res/drawable/camera_compat_dismiss_button.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<!--

     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.

-->

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

        android:width="48dp"

        android:height="43dp"

        android:viewportWidth="48"

        android:viewportHeight="43">

    <group>

        <clip-path

                android:pathData="M48,43l-48,-0l-0,-43l48,-0z"/>

        <path

                android:pathData="M24,43C37.2548,43 48,32.2548 48,19L48,0L0,-0L0,19C0,32.2548 10.7452,43 24,43Z"

                android:fillColor="@color/compat_controls_background"

                android:strokeAlpha="0.8"

                android:fillAlpha="0.8"/>

        <path

                android:pathData="M31,12.41L29.59,11L24,16.59L18.41,11L17,12.41L22.59,18L17,23.59L18.41,25L24,19.41L29.59,25L31,23.59L25.41,18L31,12.41Z"

                android:fillColor="@color/compat_controls_text"/>

    </group>

</vector>

libs/WindowManager/Shell/res/drawable/camera_compat_dismiss_ripple.xml

deleted100644 → 0
+0 −20
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.

  -->

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

        android:color="@color/compat_background_ripple">

    <item android:drawable="@drawable/camera_compat_dismiss_button"/>

</ripple>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/camera_compat_treatment_applied_button.xml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
<!--

     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.

-->

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

        android:width="48dp"

        android:height="43dp"

        android:viewportWidth="48"

        android:viewportHeight="43">

    <path

            android:pathData="M24,0C10.7452,0 0,10.7452 0,24V43H48V24C48,10.7452 37.2548,0 24,0Z"

            android:fillColor="@color/compat_controls_background"

            android:strokeAlpha="0.8"

            android:fillAlpha="0.8"/>

    <path

            android:pathData="M32,17H28.83L27,15H21L19.17,17H16C14.9,17 14,17.9 14,19V31C14,32.1 14.9,33 16,33H32C33.1,33 34,32.1 34,31V19C34,17.9 33.1,17 32,17ZM32,31H16V19H32V31Z"

            android:fillColor="@color/compat_controls_text"/>

    <path

            android:pathData="M24.6618,22C23.0436,22 21.578,22.6187 20.4483,23.625L18.25,21.375V27H23.7458L21.5353,24.7375C22.3841,24.0125 23.4649,23.5625 24.6618,23.5625C26.8235,23.5625 28.6616,25.0062 29.3028,27L30.75,26.5125C29.9012,23.8938 27.5013,22 24.6618,22Z"

            android:fillColor="@color/compat_controls_text"/>

</vector>

libs/WindowManager/Shell/res/drawable/camera_compat_treatment_applied_ripple.xml

deleted100644 → 0
+0 −20
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.

  -->

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

        android:color="@color/compat_background_ripple">

    <item android:drawable="@drawable/camera_compat_treatment_applied_button"/>

</ripple>