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

Commit 2685412e authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Convert to primary action button on call log items." into mnc-dev

parents efd4c293 b0b57a10

res/layout/call_detail.xml

+3 −3
Original line number Diff line number Diff line
@@ -85,13 +85,13 @@ 


        <ImageView

            android:id="@+id/call_back_button"

            android:layout_width="@dimen/call_button_dimen"

            android:layout_height="@dimen/call_button_dimen"

            android:layout_width="@dimen/call_log_list_item_primary_action_dimen"

            android:layout_height="@dimen/call_log_list_item_primary_action_dimen"

            android:layout_marginEnd="16dp"

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

            android:src="@drawable/ic_call_24dp"

            android:scaleType="center"

            android:tint="@color/recent_call_log_item_phone_icon_tint"

            android:tint="@color/call_log_list_item_primary_action_icon_tint"

            android:contentDescription="@string/description_call_log_call_action"

            android:visibility="gone" />

res/layout/call_log_list_item.xml

+4 −6
Original line number Diff line number Diff line
@@ -137,16 +137,14 @@ 
                </LinearLayout>



                <ImageView

                    android:id="@+id/call_icon"

                    android:layout_width="@dimen/call_button_dimen"

                    android:layout_height="@dimen/call_button_dimen"

                    android:id="@+id/primary_action_button"

                    android:layout_width="@dimen/call_log_list_item_primary_action_dimen"

                    android:layout_height="@dimen/call_log_list_item_primary_action_dimen"

                    android:layout_gravity="center_vertical"

                    android:layout_marginEnd="@dimen/call_log_icon_margin"

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

                    android:src="@drawable/ic_call_24dp"

                    android:scaleType="center"

                    android:tint="@color/recent_call_log_item_phone_icon_tint"

                    android:contentDescription="@string/description_call_log_call_action"

                    android:tint="@color/call_log_list_item_primary_action_icon_tint"

                    android:visibility="gone" />



            </LinearLayout>

res/layout/call_log_list_item_actions.xml

+15 −0
Original line number Diff line number Diff line
@@ -28,6 +28,21 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <LinearLayout

        android:id="@+id/call_action"

        style="@style/CallLogActionStyle">



        <ImageView

            style="@style/CallLogActionIconStyle"

            android:src="@drawable/ic_call_24dp" />



        <TextView

            android:id="@+id/call_action_text"

            style="@style/CallLogActionTextStyle"

            android:text="@string/description_call_log_call_action" />



    </LinearLayout>



    <LinearLayout

        android:id="@+id/video_call_action"

        style="@style/CallLogActionStyle">

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <color name="call_log_voicemail_highlight_color">#33b5e5</color>



    <!-- Tint of the recent card phone icon; 30% black -->

    <color name="recent_call_log_item_phone_icon_tint">#4d000000</color>

    <color name="call_log_list_item_primary_action_icon_tint">#4d000000</color>



    <color name="voicemail_playback_icon_tint">#8e8e8e</color>

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -133,5 +133,5 @@ 
    <dimen name="preference_side_margin">16dp</dimen>

    <dimen name="preference_summary_line_spacing_extra">4dp</dimen>



    <dimen name="call_button_dimen">36dp</dimen>

    <dimen name="call_log_list_item_primary_action_dimen">36dp</dimen>

</resources>