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

Commit d9f86ea1 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Use carrier presence when showing the video call icon." into ub-contactsdialer-b-dev 

am: 68a2bfb8d1

* commit '68a2bfb8d1e674b4b4731eed4de69ef581a44655':
  Use carrier presence when showing the video call icon.
parents ec02839e 0724c20c

res-common/drawable-xxxhdpi/ic_rx_videocam.png

deleted100755 → 0
−753 B
Loading image diff...

res-common/drawable-xxxhdpi/ic_tx_videocam.png

deleted100755 → 0
−687 B
Loading image diff...

res-common/drawable/ic_search_video_call.xml

0 → 100644
+21 −0
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

  -->



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

        android:src="@drawable/ic_videocam"

        android:autoMirrored="true"

        android:tint="@color/search_video_call_icon_tint" />

res-common/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 
        <attr name="list_item_text_offset_top" format="dimension"/>

        <attr name="list_item_data_width_weight" format="integer"/>

        <attr name="list_item_label_width_weight" format="integer"/>

        <attr name="list_item_video_call_icon_size" format="dimension"/>

        <attr name="list_item_video_call_icon_margin" format="dimension"/>

    </declare-styleable>



    <declare-styleable name="ContactBrowser">

res-common/values/colors.xml

+3 −2
Original line number Diff line number Diff line
@@ -156,10 +156,10 @@ 
    <!-- Text color used for character counter when the max limit has been exceeded -->

    <color name="call_subject_limit_exceeded">#d1041c</color>



    <!-- Tint color for the call subhect history icon. -->

    <!-- Tint color for the call subject history icon. -->

    <color name="call_subject_history_icon">#000000</color>



    <!-- Divider line on the call subhect dialog. -->

    <!-- Divider line on the call subject dialog. -->

    <color name="call_subject_divider">#d8d8d8</color>



    <!-- Text color for the SEND & CALL button on the call subject dialog. -->
@@ -167,4 +167,5 @@ 


    <!-- Background color for the call subject history view. -->

    <color name="call_subject_history_background">#ffffff</color>

    <color name="search_video_call_icon_tint">@color/searchbox_hint_text_color</color>

</resources>