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

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

Merge "Update some icons/styles used in Dialer." into mnc-dev

parents ef93faed c5bfcb40

res/drawable/call_log_action_border.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:left="-1dp" android:right="-1dp" android:bottom="-1dp">

        <shape android:shape="rectangle">

            <stroke android:width="1dp" android:color="@color/call_log_action_divider" />

        </shape>

    </item>

</layer-list>

res/layout/call_log_list_item_actions.xml

+7 −2
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

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



    <LinearLayout

        android:id="@+id/call_action"

        style="@style/CallLogActionStyle">
@@ -91,7 +96,7 @@ 


        <ImageView

            style="@style/CallLogActionIconStyle"

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

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



        <TextView

            style="@style/CallLogActionTextStyle"
@@ -105,7 +110,7 @@ 


        <ImageView

            style="@style/CallLogActionIconStyle"

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

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



        <TextView

            style="@style/CallLogActionTextStyle"

res/values/styles.xml

+1 −2
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ 
    <style name="CallLogActionStyle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">@dimen/call_log_action_height</item>

        <item name="android:background">@drawable/call_log_action_border</item>

        <item name="android:foreground">?android:attr/selectableItemBackground</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:orientation">horizontal</item>

        <item name="android:gravity">center_vertical</item>

    </style>

src/com/android/dialer/list/DialerPhoneNumberListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter { 
                break;

            case SHORTCUT_SEND_SMS_MESSAGE:

                text = resources.getString(R.string.search_shortcut_send_sms_message);

                drawableId = R.drawable.ic_textsms_24dp;

                drawableId = R.drawable.ic_message_24dp;

                break;

            case SHORTCUT_MAKE_VIDEO_CALL:

                text = resources.getString(R.string.search_shortcut_make_video_call);