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

Commit c39855fe authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android (Google) Code Review
Browse files

Merge "Fix various Quick Contact visuals"

parents 281044a4 1792b08c

res/drawable/quickcontact_list_item_background.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
     limitations under the License.

-->



<!-- TODO These all have to be refined -->

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

    <item

        android:state_window_focused="false"
@@ -31,5 +30,5 @@ 
        android:state_focused="true"

        android:drawable="@drawable/list_focused_holo" />

    <item

        android:drawable="@color/people_app_theme_color" />

        android:drawable="@color/quickcontact_list_background" />

</selector>

res/layout-sw580dp/quickcontact_activity.xml

+3 −3
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ 
            android:layout_height="200dip">

            <include layout="@layout/quickcontact_photo_container" />

        </FrameLayout>

        <include layout="@layout/quickcontact_track" />

        <View

            android:id="@+id/line_before_track"

            android:id="@+id/line_after_track"

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:background="@color/quickcontact_list_background" />

        <include layout="@layout/quickcontact_track" />

            android:background="@color/quickcontact_tab_indicator" />

        <android.support.v4.view.ViewPager

            android:id="@+id/item_list_pager"

            android:layout_width="match_parent"

res/layout-w470dp/quickcontact_activity.xml

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ 
            android:layout_height="match_parent"

            android:orientation="vertical">

            <include layout="@layout/quickcontact_track" />

            <View

                android:id="@+id/line_after_track"

                android:layout_width="match_parent"

                android:layout_height="2dip"

                android:background="@color/quickcontact_tab_indicator" />

            <android.support.v4.view.ViewPager

                android:id="@+id/item_list_pager"

                android:background="@color/quickcontact_list_background"

res/layout/quickcontact_activity.xml

+3 −3
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ 
            ex:direction="widthToHeight">

            <include layout="@layout/quickcontact_photo_container" />

        </view>

        <include layout="@layout/quickcontact_track" />

        <View

            android:id="@+id/line_before_track"

            android:id="@+id/line_after_track"

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:background="@color/quickcontact_list_background" />

        <include layout="@layout/quickcontact_track" />

            android:background="@color/quickcontact_tab_indicator" />

        <android.support.v4.view.ViewPager

            android:id="@+id/item_list_pager"

            android:layout_width="match_parent"

res/layout/quickcontact_list_item.xml

+7 −5
Original line number Diff line number Diff line
@@ -36,28 +36,30 @@ 
            android:id="@android:id/text1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@android:color/white"

            android:textColor="@color/primary_text_color"

            android:textAppearance="?android:attr/textAppearanceMedium" />

        <TextView

            android:id="@android:id/text2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@android:color/white"

            android:textColor="@color/primary_text_color"

            android:textAllCaps="true"

            android:textAppearance="?android:attr/textAppearanceSmall" />

    </LinearLayout>

    <View

        android:id="@+id/vertical_divider"

        android:layout_width="1dip"

        android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

        android:background="@drawable/ic_divider_dashed_holo_dark" />

        android:layout_marginTop="@dimen/detail_vertical_divider_vertical_margin"

        android:layout_marginBottom="@dimen/detail_vertical_divider_vertical_margin"

        android:background="?android:attr/dividerVertical" />

    <ImageView

        android:id="@+id/secondary_action_button"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingLeft="@dimen/detail_item_icon_margin"

        android:paddingRight="@dimen/detail_item_icon_margin"

        android:background="@drawable/quickcontact_list_item_background"

        android:background="?android:attr/selectableItemBackground"

        android:duplicateParentState="false" />

</LinearLayout>