Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev

am: aa599e737a Change-Id: Ib34b49b163c5753d5eda17a1e7521436fedd2678
2019-04-10 12:49:12 -07:00
parent f7422c7e68 aa599e737a
commit 1e5d1ba5ff
15 changed files with 11 additions and 11 deletions
--- a/res/layout/homepage_condition_footer.xml
+++ b/res/layout/homepage_condition_footer.xml
--- a/res/layout/homepage_condition_full_tile.xml
+++ b/res/layout/homepage_condition_full_tile.xml
--- a/res/layout/homepage_condition_half_tile.xml
+++ b/res/layout/homepage_condition_half_tile.xml
--- a/res/layout/homepage_condition_header.xml
+++ b/res/layout/homepage_condition_header.xml
--- a/res/layout/homepage_condition_header_icon.xml
+++ b/res/layout/homepage_condition_header_icon.xml
--- a/res/layout/contextual_card_dismissal_view.xml
+++ b/res/layout/contextual_card_dismissal_view.xml
--- a/res/layout/homepage_slice_deferred_setup_tile.xml
+++ b/res/layout/homepage_slice_deferred_setup_tile.xml
--- a/res/layout/contextual_slice_full_tile.xml
+++ b/res/layout/contextual_slice_full_tile.xml
@@ -36,7 +36,7 @@
            android:importantForAccessibility="no"/>

        <!--dismissal view-->
-        <include layout="@layout/homepage_dismissal_view"/>
+        <include layout="@layout/contextual_card_dismissal_view"/>

    </FrameLayout>
 </com.google.android.material.card.MaterialCardView>
--- a/res/layout/contextual_slice_half_tile.xml
+++ b/res/layout/contextual_slice_half_tile.xml
@@ -57,7 +57,7 @@
        </LinearLayout>

        <!--dismissal view-->
-        <include layout="@layout/homepage_dismissal_view"/>
+        <include layout="@layout/contextual_card_dismissal_view"/>

    </FrameLayout>
 </com.google.android.material.card.MaterialCardView>
--- a/res/layout/homepage_suggestion_tile.xml
+++ b/res/layout/homepage_suggestion_tile.xml