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

Rename resource variable names: homepage_* -> contextual_*

Browse Source 
Fixes: 130250419
Test: rebuild
Change-Id: I497f2d8e48fb6b5cd54b40e5f5b0691de0e19b1c
This commit is contained in:
Fan Zhang
2019-04-10 12:25:10 -07:00
parent aa599e737a
commit b64d16dcad
15 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/conditional_card_footer.xml
View File

@@ -18,12 +18,12 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/homepage_condition_footer_height"
android:layout_height="@dimen/contextual_condition_footer_height"
android:contentDescription="@string/homepage_condition_footer_content_description"
android:gravity="end"
android:orientation="horizontal"
android:paddingTop="@dimen/homepage_condition_footer_padding_top"
android:paddingEnd="@dimen/homepage_condition_footer_padding_end">
android:paddingTop="@dimen/contextual_condition_footer_padding_top"
android:paddingEnd="@dimen/contextual_condition_footer_padding_end">
<ImageView
android:id="@+id/collapse_button"

18
res/layout/conditional_card_full_tile.xml
View File

@@ -30,32 +30,32 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/homepage_card_icon_padding_start"
android:paddingEnd="@dimen/homepage_full_card_padding_end"
android:paddingTop="@dimen/homepage_condition_full_card_padding_top"
android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"
android:paddingStart="@dimen/contextual_card_icon_padding_start"
android:paddingEnd="@dimen/contextual_full_card_padding_end"
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">
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
android:layout_height="@dimen/homepage_card_icon_size"
android:layout_width="@dimen/contextual_card_icon_size"
android:layout_height="@dimen/contextual_card_icon_size"
android:tint="?android:attr/colorAccent"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="@dimen/homepage_condition_full_card_padding_start"
android:paddingEnd="@dimen/homepage_condition_full_card_padding_end"
android:paddingStart="@dimen/contextual_condition_full_card_padding_start"
android:paddingEnd="@dimen/contextual_condition_full_card_padding_end"
android:orientation="vertical">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"
android:layout_marginBottom="@dimen/contextual_condition_card_title_margin_bottom"
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
<TextView

20
res/layout/conditional_card_half_tile.xml
View File

@@ -25,20 +25,20 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/homepage_condition_half_card_padding_top"
android:paddingTop="@dimen/contextual_condition_half_card_padding_top"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/homepage_card_padding_end"
android:paddingEnd="@dimen/contextual_card_padding_end"
android:orientation="vertical">
<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"
android:layout_width="@dimen/contextual_card_icon_size"
android:layout_height="@dimen/contextual_card_icon_size"
android:layout_marginStart="@dimen/contextual_card_icon_padding_start"
android:tint="?android:attr/colorAccent"/>
<TextView
@@ -47,9 +47,9 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"
android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
android:layout_marginTop="@dimen/contextual_condition_half_card_title_margin_top"
android:layout_marginBottom="@dimen/contextual_condition_card_title_margin_bottom"
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
<TextView
@@ -58,8 +58,8 @@
android:layout_height="wrap_content"
android:lines="2"
android:ellipsize="end"
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
android:layout_marginBottom="@dimen/contextual_condition_half_card_summary_margin_bottom"
android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>
</LinearLayout>

12
res/layout/conditional_card_header.xml
View File

@@ -25,8 +25,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/homepage_condition_header_padding_top"
android:paddingBottom="@dimen/homepage_condition_header_padding_bottom"
android:paddingTop="@dimen/contextual_condition_header_padding_top"
android:paddingBottom="@dimen/contextual_condition_header_padding_bottom"
android:orientation="horizontal"
android:gravity="center_vertical">
@@ -35,7 +35,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginStart="@dimen/homepage_condition_header_icons_margin_start"
android:layout_marginStart="@dimen/contextual_condition_header_icons_margin_start"
android:orientation="horizontal"
android:gravity="center_vertical"/>
@@ -43,9 +43,9 @@
android:id="@+id/expand_indicator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingTop="@dimen/homepage_condition_header_indicator_padding_top"
android:paddingStart="@dimen/homepage_condition_header_indicator_padding_start"
android:paddingEnd="@dimen/homepage_condition_header_indicator_padding_end"
android:paddingTop="@dimen/contextual_condition_header_indicator_padding_top"
android:paddingStart="@dimen/contextual_condition_header_indicator_padding_start"
android:paddingEnd="@dimen/contextual_condition_header_indicator_padding_end"
android:src="@drawable/ic_expand_more_inverse"
android:tint="?android:attr/colorControlNormal"/>

6
res/layout/conditional_card_header_icon.xml
View File

@@ -17,7 +17,7 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_condition_header_icon_width_height"
android:layout_height="@dimen/homepage_condition_header_icon_width_height"
android:layout_marginEnd="@dimen/homepage_condition_header_icon_margin_end"
android:layout_width="@dimen/contextual_condition_header_icon_width_height"
android:layout_height="@dimen/contextual_condition_header_icon_width_height"
android:layout_marginEnd="@dimen/contextual_condition_header_icon_margin_end"
android:tint="?android:attr/colorAccent"/>

10
res/layout/contextual_card_dismissal_view.xml
View File

@@ -20,15 +20,15 @@
android:id="@+id/dismissal_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/homepage_card_dismissal_background"
android:background="@color/contextual_card_dismissal_background"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_dismissal_side_margin"
android:layout_marginTop="@dimen/homepage_card_dismissal_margin_top"
android:layout_marginStart="@dimen/contextual_card_dismissal_side_margin"
android:layout_marginTop="@dimen/contextual_card_dismissal_margin_top"
android:text="@string/contextual_card_dismiss_confirm_message"
android:textAppearance="@style/TextAppearance.ContextualCardDismissalText"/>
@@ -49,8 +49,8 @@
style="@style/ContextualCardDismissalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_dismissal_button_margin_start"
android:layout_marginEnd="@dimen/homepage_card_dismissal_button_margin_end"
android:layout_marginStart="@dimen/contextual_card_dismissal_button_margin_start"
android:layout_marginEnd="@dimen/contextual_card_dismissal_button_margin_end"
android:text="@string/contextual_card_dismiss_remove"/>
</LinearLayout>

24
res/layout/contextual_slice_deferred_setup.xml
View File

@@ -27,22 +27,22 @@
android:layout_height="match_parent"
android:gravity="left"
android:orientation="vertical"
android:paddingEnd="@dimen/homepage_card_padding_end"
android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top"
android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom">
android:paddingEnd="@dimen/contextual_card_padding_end"
android:paddingTop="@dimen/contextual_deferred_setup_card_padding_top"
android:paddingBottom="@dimen/contextual_deferred_setup_card_padding_bottom">
<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"/>
android:layout_width="@dimen/contextual_card_icon_size"
android:layout_height="@dimen/contextual_card_icon_size"
android:layout_marginStart="@dimen/contextual_card_icon_padding_start"/>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_deferred_setup_card_title_margin_top"
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
android:layout_marginTop="@dimen/contextual_deferred_setup_card_title_margin_top"
android:ellipsize="end"
android:maxLines="2"
android:minLines="1"
@@ -52,8 +52,8 @@
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_deferred_setup_card_summary_margin_top"
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
android:layout_marginTop="@dimen/contextual_deferred_setup_card_summary_margin_top"
android:ellipsize="end"
android:maxLines="2"
android:minLines="1"
@@ -64,8 +64,8 @@
style="@style/DeferredSetupCardButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
android:layout_marginTop="@dimen/homepage_deferred_setup_card_button_margin_top"
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
android:layout_marginTop="@dimen/contextual_deferred_setup_card_button_margin_top"
android:text="@string/suggestion_button_text"/>
</LinearLayout>

16
res/layout/contextual_slice_half_tile.xml
View File

@@ -31,17 +31,17 @@
android:id="@+id/content"
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: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:orientation="vertical">
<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"/>
android:layout_width="@dimen/contextual_card_icon_size"
android:layout_height="@dimen/contextual_card_icon_size"
android:layout_marginStart="@dimen/contextual_card_icon_padding_start"/>
<TextView
android:id="@android:id/title"
@@ -50,8 +50,8 @@
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:layout_marginStart="@dimen/contextual_card_text_padding_start"
android:layout_marginTop="@dimen/contextual_half_card_title_margin_top"
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
</LinearLayout>

6
res/layout/dismissal_swipe_background.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/dismissal_swipe_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/homepage_card_dismissal_background">
android:background="@color/contextual_card_dismissal_background">
<ImageView
android:id="@+id/dismissal_icon_start"
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_delete"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="@dimen/homepage_card_dismissal_side_margin"/>
android:layout_marginStart="@dimen/contextual_card_dismissal_side_margin"/>
<Space
android:layout_width="0dp"
@@ -41,6 +41,6 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_delete"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="@dimen/homepage_card_dismissal_side_margin"/>
android:layout_marginEnd="@dimen/contextual_card_dismissal_side_margin"/>
</LinearLayout>

4
res/layout/legacy_suggestion_tile.xml
View File

@@ -36,8 +36,8 @@
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/homepage_card_icon_size"
android:layout_height="@dimen/homepage_card_icon_size"
android:layout_width="@dimen/contextual_card_icon_size"
android:layout_height="@dimen/contextual_card_icon_size"
style="@style/SuggestionCardIcon"
android:layout_marginTop="16dp"
android:layout_marginBottom="6dp"/>

4
res/layout/settings_homepage_container.xml
View File

@@ -39,8 +39,8 @@
android:id="@+id/contextual_cards_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_side_margin"
android:layout_marginEnd="@dimen/homepage_card_side_margin"/>
android:layout_marginStart="@dimen/contextual_card_side_margin"
android:layout_marginEnd="@dimen/contextual_card_side_margin"/>
<FrameLayout
android:id="@+id/main_content"

2
res/layout/time_zone_search_header.xml
View File

@@ -18,7 +18,7 @@
instead of an ImageView -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+android:id/title"
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"