Snap for 5540187 from 576cb8b0df95a7e62470030123ba7099714a5ff3 to qt-release (2363362a) · Commits · e / os / android_packages_apps_Settings

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>

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@

		<androidx.slice.widget.SliceView
		android:id="@+id/slice_view"
		style="@style/SliceViewStyle"
		style="@style/ContextualCardSliceViewStyle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"

+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