PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix no touch feedback present on the settings suggestion card." into qt-dev

Browse Source 
am: 87d9626a78

Change-Id: I3c99d8707347037d904bb6f1feb7c0148dbd8cb4
This commit is contained in:
Stanley Wang
2019-05-07 00:56:51 -07:00
committed by android-build-merger
parent 0d894197f6 87d9626a78
commit 5e9094c0f3
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/drawable/contextual_card_background.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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>

3
res/layout/conditional_card_full_tile.xml
View File

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

7
res/layout/conditional_card_half_tile.xml
View File

@@ -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"
@@ -82,4 +83,4 @@
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>

4
res/layout/contextual_slice_half_tile.xml
View File

@@ -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
@@ -60,4 +60,4 @@
<include layout="@layout/contextual_card_dismissal_view"/>
</FrameLayout>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>