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

Commit e7c126c8 authored by Zhu Youhua's avatar Zhu Youhua Committed by Linux Build Service Account
Browse files

Contacts : Add presenceService and video calling menu.

- Add presenceService to check contact phone When show contact list.
- If the contact phone support video call will show the video
  calling button.

CRs-Fixed: 1039337
Change-Id: I8f3297d5a5a1d7433c9b1240ceeb480291a2bce6
parent 32ae9412
Loading
Loading
Loading
Loading

Android.mk

100755 → 100644
+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ asset_dirs := $(contacts_common_dir)/assets
src_dirs += src-N $(contacts_common_dir)/src-N $(phone_common_dir)/src-N

LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_SRC_FILES += src/org/codeaurora/presenceserv/IPresenceService.aidl \
                   src/org/codeaurora/presenceserv/IPresenceServiceCB.aidl

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
    $(support_library_root_dir)/v7/cardview/res
LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@
        android:background="@color/divider_line_color_light"
        android:visibility="gone" />

    <Switch
        android:id="@+id/switch_video_call"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginLeft="30dp"
        android:layout_marginTop="@dimen/expanding_entry_card_item_image_spacing"
        android:visibility="gone"
        android:text="@string/video_call" />

    <LinearLayout
        android:id="@+id/content_area_linear_layout"
        android:layout_width="match_parent"
+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@
        android:id="@+id/menu_star"
        android:showAsAction="always" />

    <item
        android:id="@+id/menu_refresh"
        android:title="@string/menu_refresh" />

    <item
        android:id="@+id/menu_edit"
        android:showAsAction="always" />
+4 −0
Original line number Diff line number Diff line
@@ -48,4 +48,8 @@

    <!-- File Authority for AOSP Contacts files -->
    <string name="contacts_file_provider_authority">com.android.contacts.files</string>

    <!-- If true , the video calling menu will be shown
         and the presence service will be enabled -->
    <bool name="config_regional_presence_enable">false</bool>
</resources>
+7 −0
Original line number Diff line number Diff line
@@ -881,6 +881,13 @@
    <!-- Quick contact display name with phonetic name -->
    <string name="quick_contact_display_name_with_phonetic"><xliff:g id="display_name">%s</xliff:g> (<xliff:g id="phonetic_name">%s</xliff:g>)</string>


    <!-- Menu item used to refresh a specific contact -->
    <string name="menu_refresh">Refresh</string>

    <string name="video_call">Video Calling</string>


    <!-- Button used in quick contact suggestion card to link selected contacts. [CHAR LIMIT=30]-->
    <string name="quickcontact_suggestion_link_button">LINK CONTACTS</string>

Loading