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

Commit f0df3667 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Move secondary action view/button out of primary action view to provide... 

Merge "Move secondary action view/button out of primary action view to provide a more clear separation of the pressable areas for both."
parents c930321e c0f6db94

res/layout/call_log_list_item.xml

+52 −41
Original line number Diff line number Diff line
@@ -34,10 +34,21 @@ 
        @id/call_log_item gone

    -->



    <!-- Linear layout to separate the primary area containing the contact badge and caller

         information and the secondary action (call details / play voicemail). -->

    <LinearLayout

            android:id="@+id/primary_action_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:gravity="center_vertical"

        >



        <!-- Primary area containing the contact badge and caller information -->

        <LinearLayout

            android:id="@+id/primary_action_view"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_centerVertical="true"

            android:padding="@dimen/call_log_outer_margin"

            android:orientation="horizontal"
@@ -114,12 +125,13 @@ 
                        />

                </LinearLayout>

            </LinearLayout>

            <!-- Linear layout to house a vertical separator line and the

                 secondary action button.  Used as a convenience to hide both

                 the separator and action button at the same time. -->

        </LinearLayout>

        <!-- Linear layout to house a vertical separator line and the secondary action button.

             Used as a convenience to hide both the separator and action button at the same

             time. -->

        <LinearLayout

            android:id="@+id/secondary_action_view"

                android:layout_width="wrap_content"

            android:layout_width="@dimen/call_log_call_action_width"

            android:layout_height="match_parent"

            android:orientation="horizontal"

            android:gravity="center_vertical"
@@ -135,7 +147,7 @@ 
            <!-- The secondary action button; either play voicemail or call details. -->

            <ImageButton

                android:id="@+id/secondary_action_icon"

                    android:layout_width="@dimen/call_log_call_action_width"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:paddingStart="@dimen/call_log_inner_margin"

                android:paddingTop="@dimen/call_log_inner_margin"
@@ -147,7 +159,6 @@ 
                />

        </LinearLayout>

    </LinearLayout>



    <TextView

        android:id="@+id/call_log_header"

        style="@style/ContactListSeparatorTextViewStyle"