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

Commit 4ba9043f authored by Massimo Carli's avatar Massimo Carli
Browse files

Removed unwanted shadow in restart and letterbox education dialogs 

Fixes: 269101633
Test: Click on the restart button and check buttons don't have
shadows in the restart dialog. Same for the dismiss button
in the letterbox education dialog.

Change-Id: I0c7dc1f9894f0417f66f13afd35a45f93f925b26
parent a100480a

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

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

<!--

  ~ 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"

       android:shape="rectangle">

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

    <corners android:radius="12dp"/>

</shape>
 
 No newline at end of file

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

+27 −4
Original line number Diff line number Diff line
@@ -14,7 +14,30 @@ 
  ~ 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/letterbox_education_dismiss_button_background_ripple">

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

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

       android:insetTop="@dimen/letterbox_education_dialog_vertical_inset"

       android:insetBottom="@dimen/letterbox_education_dialog_vertical_inset">

    <ripple android:color="@color/letterbox_education_dismiss_button_background_ripple">

        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <corners android:radius="@dimen/letterbox_education_dialog_button_radius"/>

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

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

                <corners android:radius="@dimen/letterbox_education_dialog_button_radius"/>

                <padding android:left="@dimen/letterbox_education_dialog_horizontal_padding"

                         android:top="@dimen/letterbox_education_dialog_vertical_padding"

                         android:right="@dimen/letterbox_education_dialog_horizontal_padding"

                         android:bottom="@dimen/letterbox_education_dialog_vertical_padding"/>

            </shape>

        </item>

    </ripple>

</inset>

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

deleted100644 → 0
+0 −22
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"

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

    <solid android:color="?androidprv:attr/colorAccentPrimaryVariant"/>

    <corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/>

</shape>
 
 No newline at end of file

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

+28 −4
Original line number Diff line number Diff line
@@ -14,7 +14,31 @@ 
  ~ 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/letterbox_restart_button_background_ripple">

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

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

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:insetTop="@dimen/letterbox_restart_dialog_vertical_inset"

       android:insetBottom="@dimen/letterbox_restart_dialog_vertical_inset">

    <ripple android:color="@color/letterbox_restart_dismiss_button_background_ripple">

        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/>

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

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

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

                <solid android:color="?androidprv:attr/colorAccentPrimaryVariant"/>

                <corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/>

                <padding android:left="@dimen/letterbox_restart_dialog_horizontal_padding"

                         android:top="@dimen/letterbox_restart_dialog_vertical_padding"

                         android:right="@dimen/letterbox_restart_dialog_horizontal_padding"

                         android:bottom="@dimen/letterbox_restart_dialog_vertical_padding"/>

            </shape>

        </item>

    </ripple>

</inset>
 
 No newline at end of file

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

deleted100644 → 0
+0 −23
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"

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

    <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant" android:width="1dp"/>

    <solid android:color="?androidprv:attr/colorSurface" />

    <corners android:radius="@dimen/letterbox_restart_dialog_button_radius"/>

</shape>
 
 No newline at end of file