Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781 Change-Id: I6ce40af99f6494a915040e662c86ad0e93444110
This commit is contained in:
@@ -15,20 +15,19 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<FrameLayout
|
<com.google.android.material.card.MaterialCardView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content"
|
||||||
<com.google.android.material.card.MaterialCardView
|
android:layout_margin="8dp"
|
||||||
android:id="@+id/container"
|
android:foreground="@drawable/contextual_card_background"
|
||||||
|
android:clickable="true"
|
||||||
|
style="@style/ContextualCardStyle">
|
||||||
|
|
||||||
|
<include
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="8dp"
|
android:layout_marginStart="-8dp"
|
||||||
style="@style/ContextualCardStyle">
|
layout="@layout/settingslib_preference"/>
|
||||||
<include
|
</com.google.android.material.card.MaterialCardView>
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="-8dp"
|
|
||||||
layout="@layout/settingslib_preference" />
|
|
||||||
</com.google.android.material.card.MaterialCardView>
|
|
||||||
</FrameLayout>
|
|
||||||
|
Reference in New Issue
Block a user