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

Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev

Browse Source 
am: 8b3cde0fb1

Change-Id: Ia9747b66b6e5f4ed332d979fcf6ecbe692bc5180
This commit is contained in:
Yi-Ling Chuang
2019-04-09 10:45:10 -07:00
committed by android-build-merger
parent 2bb41176cf 8b3cde0fb1
commit 4b6479bcf7
9 changed files with 86 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/homepage_dismissal_view.xml
View File

@@ -21,7 +21,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/homepage_card_dismissal_background"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"

58
res/layout/homepage_slice_half_tile.xml
View File

@@ -27,43 +27,37 @@
<include layout="@layout/dismissal_swipe_background"/>
<ViewFlipper
android:id="@+id/view_flipper"
<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:paddingEnd="@dimen/homepage_card_padding_end"
android:paddingTop="@dimen/homepage_half_card_padding_top"
android:paddingBottom="@dimen/homepage_half_card_padding_bottom"
android:background="@color/contextual_card_background"
android:orientation="vertical">
<LinearLayout
android:id="@+id/content"
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
android:layout_height="@dimen/homepage_card_icon_size"
android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>
<TextView
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingEnd="@dimen/homepage_card_padding_end"
android:paddingTop="@dimen/homepage_half_card_padding_top"
android:paddingBottom="@dimen/homepage_half_card_padding_bottom"
android:background="@color/contextual_card_background"
android:orientation="vertical">
android:layout_height="wrap_content"
android:maxLines="2"
android:minLines="1"
android:ellipsize="end"
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_half_card_title_margin_top"
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
android:layout_height="@dimen/homepage_card_icon_size"
android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>
</LinearLayout>
<TextView
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:minLines="1"
android:ellipsize="end"
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_half_card_title_margin_top"
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
<!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/>
</LinearLayout>
<!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/>
</ViewFlipper>
</FrameLayout>
</com.google.android.material.card.MaterialCardView>

29
res/layout/homepage_slice_tile.xml
View File

@@ -27,29 +27,16 @@
<include layout="@layout/dismissal_swipe_background"/>
<ViewFlipper
android:id="@+id/view_flipper"
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
style="@style/SliceViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"/>
<LinearLayout
android:id="@+id/slice_view_wrapper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/contextual_card_background">
<!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/>
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"
style="@style/SliceViewStyle"/>
</LinearLayout>
<!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/>
</ViewFlipper>
</FrameLayout>
</com.google.android.material.card.MaterialCardView>