Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 98db0709e7

Change-Id: I9aba4488661208189a9dd5b3d36ac57ca9fff2d7
This commit is contained in:
TreeHugger Robot
2020-04-14 09:18:19 +00:00
committed by Automerger Merge Worker
3 changed files with 32 additions and 7 deletions

View File

@@ -19,7 +19,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ContextualCardStyle">
style="@style/ContextualCardStyle"
android:importantForAccessibility="no">
<include layout="@layout/dismissal_swipe_background"/>
@@ -28,10 +29,9 @@
android:theme="@style/Theme.Settings.ContextualCard"
style="@style/ContextualCardSliceViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:importantForAccessibility="no"/>
android:layout_height="wrap_content"/>
<!--dismissal view-->
<!--dismissal view -->
<include layout="@layout/contextual_card_dismissal_view"/>
</com.google.android.material.card.MaterialCardView>

View File

@@ -19,14 +19,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ContextualCardStyle">
style="@style/ContextualCardStyle"
android:importantForAccessibility="no">
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:theme="@style/Theme.Settings.ContextualCard"
style="@style/ContextualCardSliceViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:importantForAccessibility="no"/>
android:layout_height="wrap_content"/>
</com.google.android.material.card.MaterialCardView>