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

Commit 109dc516 authored by Stanley Wang's avatar Stanley Wang
Browse files

Fix no touch feedback present on the settings suggestion card. 

Add selectableItemBackground attribut to conditional card layout,
and add new background for contextual half card.

Fixes: 129357518
Test:  manual
Change-Id: I726acfa3a55560d9b34f973b141e4a89cc8e8b68
parent 87631db9

res/drawable/contextual_card_background.xml

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

<!--

  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.

  -->

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

        android:color="?android:attr/colorControlHighlight">

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

        <color android:color="@color/contextual_card_background"/>

    </item>

</ripple>

res/layout/conditional_card_full_tile.xml

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
            android:paddingTop="@dimen/contextual_condition_full_card_padding_top"

            android:paddingBottom="@dimen/contextual_condition_full_card_padding_bottom"

            android:orientation="horizontal"

            android:gravity="center_vertical">

            android:gravity="center_vertical"

            android:background="?android:attr/selectableItemBackground">



            <ImageView

                android:id="@android:id/icon"

res/layout/conditional_card_half_tile.xml

+4 −3
Original line number Diff line number Diff line
@@ -25,14 +25,15 @@ 
        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/contextual_condition_half_card_padding_top"

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/contextual_condition_half_card_padding_top"

            android:paddingEnd="@dimen/contextual_card_padding_end"

            android:orientation="vertical">

            android:orientation="vertical"

            android:background="?android:attr/selectableItemBackground">



            <ImageView

                android:id="@android:id/icon"

res/layout/contextual_slice_half_tile.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
            android:paddingEnd="@dimen/contextual_card_padding_end"

            android:paddingTop="@dimen/contextual_half_card_padding_top"

            android:paddingBottom="@dimen/contextual_half_card_padding_bottom"

            android:background="@color/contextual_card_background"

            android:background="@drawable/contextual_card_background"

            android:orientation="vertical">



            <ImageView