Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d9dadb1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev

parents 9eef4964 b64d16dc

res/layout/conditional_card_footer.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,12 +18,12 @@ 
<LinearLayout

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    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:contentDescription="@string/homepage_condition_footer_content_description"

    android:gravity="end"

    android:gravity="end"

    android:orientation="horizontal"

    android:orientation="horizontal"

    android:paddingTop="@dimen/homepage_condition_footer_padding_top"

    android:paddingTop="@dimen/contextual_condition_footer_padding_top"

    android:paddingEnd="@dimen/homepage_condition_footer_padding_end">

    android:paddingEnd="@dimen/contextual_condition_footer_padding_end">





    <ImageView

    <ImageView

        android:id="@+id/collapse_button"

        android:id="@+id/collapse_button"

res/layout/conditional_card_full_tile.xml

+9 −9
Original line number Original line Diff line number Diff line
@@ -30,32 +30,32 @@ 
            android:id="@+id/content"

            android:id="@+id/content"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="@dimen/homepage_card_icon_padding_start"

            android:paddingStart="@dimen/contextual_card_icon_padding_start"

            android:paddingEnd="@dimen/homepage_full_card_padding_end"

            android:paddingEnd="@dimen/contextual_full_card_padding_end"

            android:paddingTop="@dimen/homepage_condition_full_card_padding_top"

            android:paddingTop="@dimen/contextual_condition_full_card_padding_top"

            android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"

            android:paddingBottom="@dimen/contextual_condition_full_card_padding_bottom"

            android:orientation="horizontal"

            android:orientation="horizontal"

            android:gravity="center_vertical">

            android:gravity="center_vertical">





            <ImageView

            <ImageView

                android:id="@android:id/icon"

                android:id="@android:id/icon"

                android:layout_width="@dimen/homepage_card_icon_size"

                android:layout_width="@dimen/contextual_card_icon_size"

                android:layout_height="@dimen/homepage_card_icon_size"

                android:layout_height="@dimen/contextual_card_icon_size"

                android:tint="?android:attr/colorAccent"/>

                android:tint="?android:attr/colorAccent"/>





            <LinearLayout

            <LinearLayout

                android:layout_width="0dp"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_weight="1"

                android:paddingStart="@dimen/homepage_condition_full_card_padding_start"

                android:paddingStart="@dimen/contextual_condition_full_card_padding_start"

                android:paddingEnd="@dimen/homepage_condition_full_card_padding_end"

                android:paddingEnd="@dimen/contextual_condition_full_card_padding_end"

                android:orientation="vertical">

                android:orientation="vertical">





                <TextView

                <TextView

                    android:id="@android:id/title"

                    android:id="@android:id/title"

                    android:layout_width="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_height="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"/>

                    android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>





                <TextView

                <TextView

res/layout/conditional_card_half_tile.xml

+10 −10
Original line number Original line Diff line number Diff line
@@ -25,20 +25,20 @@ 
        android:id="@+id/content"

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        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">

        android:orientation="vertical">





        <LinearLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:paddingEnd="@dimen/homepage_card_padding_end"

            android:paddingEnd="@dimen/contextual_card_padding_end"

            android:orientation="vertical">

            android:orientation="vertical">





            <ImageView

            <ImageView

                android:id="@android:id/icon"

                android:id="@android:id/icon"

                android:layout_width="@dimen/homepage_card_icon_size"

                android:layout_width="@dimen/contextual_card_icon_size"

                android:layout_height="@dimen/homepage_card_icon_size"

                android:layout_height="@dimen/contextual_card_icon_size"

                android:layout_marginStart="@dimen/homepage_card_icon_padding_start"

                android:layout_marginStart="@dimen/contextual_card_icon_padding_start"

                android:tint="?android:attr/colorAccent"/>

                android:tint="?android:attr/colorAccent"/>





            <TextView

            <TextView
@@ -47,9 +47,9 @@ 
                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:maxLines="1"

                android:maxLines="1"

                android:ellipsize="end"

                android:ellipsize="end"

                android:layout_marginStart="@dimen/homepage_card_text_padding_start"

                android:layout_marginStart="@dimen/contextual_card_text_padding_start"

                android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"

                android:layout_marginTop="@dimen/contextual_condition_half_card_title_margin_top"

                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"/>

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>





            <TextView

            <TextView
@@ -58,8 +58,8 @@ 
                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:lines="2"

                android:lines="2"

                android:ellipsize="end"

                android:ellipsize="end"

                android:layout_marginStart="@dimen/homepage_card_text_padding_start"

                android:layout_marginStart="@dimen/contextual_card_text_padding_start"

                android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"

                android:layout_marginBottom="@dimen/contextual_condition_half_card_summary_margin_bottom"

                android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>

                android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>





        </LinearLayout>

        </LinearLayout>

res/layout/conditional_card_header.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -25,8 +25,8 @@ 
    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/homepage_condition_header_padding_top"

        android:paddingTop="@dimen/contextual_condition_header_padding_top"

        android:paddingBottom="@dimen/homepage_condition_header_padding_bottom"

        android:paddingBottom="@dimen/contextual_condition_header_padding_bottom"

        android:orientation="horizontal"

        android:orientation="horizontal"

        android:gravity="center_vertical">

        android:gravity="center_vertical">
@@ -35,7 +35,7 @@ 
            android:layout_width="0dp"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_weight="1"

            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:orientation="horizontal"

            android:gravity="center_vertical"/>

            android:gravity="center_vertical"/>
@@ -43,9 +43,9 @@ 
            android:id="@+id/expand_indicator"

            android:id="@+id/expand_indicator"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:paddingTop="@dimen/homepage_condition_header_indicator_padding_top"

            android:paddingTop="@dimen/contextual_condition_header_indicator_padding_top"

            android:paddingStart="@dimen/homepage_condition_header_indicator_padding_start"

            android:paddingStart="@dimen/contextual_condition_header_indicator_padding_start"

            android:paddingEnd="@dimen/homepage_condition_header_indicator_padding_end"

            android:paddingEnd="@dimen/contextual_condition_header_indicator_padding_end"

            android:src="@drawable/ic_expand_more_inverse"

            android:src="@drawable/ic_expand_more_inverse"

            android:tint="?android:attr/colorControlNormal"/>

            android:tint="?android:attr/colorControlNormal"/>

res/layout/conditional_card_header_icon.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 




<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

           android:id="@android:id/icon"

           android:id="@android:id/icon"

           android:layout_width="@dimen/homepage_condition_header_icon_width_height"

           android:layout_width="@dimen/contextual_condition_header_icon_width_height"

           android:layout_height="@dimen/homepage_condition_header_icon_width_height"

           android:layout_height="@dimen/contextual_condition_header_icon_width_height"

           android:layout_marginEnd="@dimen/homepage_condition_header_icon_margin_end"

           android:layout_marginEnd="@dimen/contextual_condition_header_icon_margin_end"

           android:tint="?android:attr/colorAccent"/>
 
           android:tint="?android:attr/colorAccent"/>
 
 No newline at end of file