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

Commit 3eba77ca authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Update colors for popup menus" into udc-dev

parents 20c26a4a 1a76d5c7

res/color-night-v31/popup_color_background.xml

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

-->

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

    <item

        android:color="@android:color/system_neutral1_900"

        android:lStar="12" />

</selector>

res/color-v31/popup_color_background.xml

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

-->

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

    <item

        android:color="@android:color/system_neutral1_50"

        android:lStar="94" />

</selector>

res/color/popup_color_background.xml

0 → 100644
+18 −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.

-->

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

    <item android:color="?attr/popupColorBackground" />

</selector>

res/drawable/popup_background_material_u.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->

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

    android:shape="rectangle">

    <solid android:color="?attr/popupColorPrimary"/>

    <solid android:color="?attr/popupColorBackground"/>

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

</shape>
 
 No newline at end of file

res/layout/deep_shortcut_material_u.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:singleLine="true"

        android:ellipsize="end"

        android:textSize="14sp"

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

        android:textColor="?attr/popupTextColor"

        launcher:layoutHorizontal="true"

        launcher:iconDisplay="shortcut_popup"

        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" />