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

Commit 6d83a7aa authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of atel.lnx.2.0-00007. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1039233   I6dd82ca9e968dd9132536503bc5ec336cdea4e84   Dialer: Add call/data usage Timer in Dialer setting
1059168   I3e45869317aae68df46f236b2914e87281c68118   Dialer: Fix FC issue and mismatch string in CalllogActiv
1060373   Id2522beecb9abe286e3ca04bdc25697a8b81a1a7   InCallUI: Incall timer overlap while upgrade
1039337 1062801   Id02b1f445d95cb40c48705fb1f8faecbf348d884   Dialer: add video call capability check based on Presenc
1020028   I5e44b1ea74f327e88fe4f66a129d2b34a4b2bff8   IMS: Check ConferDialer config according to subscription
1031498   I08c773d9bcc3c99b9aee3b2bb235f3d38762d380   IMS-VT: Do not toggle full screen mode when not in video
1056626   Iacb432ea9c21993a9d5d2269e87553174234ee0c   Dialer: add Chinese strings for IMS call
1039290 1039350   I59ad99e03ab54af9a43c562f8115367e9576f891   Dialer: WFC: Add wifi call features.
1039326 952976   I310bcbf021f1217a6e2a648d33b266297d7d9212   InCallUI: customize video call UI

Change-Id: I09e4180575e9afaea7c4aa5808f6757944146461
CRs-Fixed: 1039326, 1059168, 1039290, 952976, 1039350, 1039337, 1060373, 1039233, 1056626, 1031498, 1062801, 1020028
parents f4176132 fbc87c0a

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ src_dirs += \ 
    $(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 \

    $(support_library_root_dir)/v7/recyclerview/res \

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -59,6 +60,7 @@ 
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.BROADCAST_STICKY" />

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <!-- This tells the activity manager to not delay any of our activity

     start requests, even if they happen immediately after the user

     presses home. -->

InCallUI/res/layout/call_button_fragment.xml

+18 −0
Original line number Diff line number Diff line
@@ -197,6 +197,24 @@ 
            android:contentDescription="@string/onscreenManageConferenceText"

            android:visibility="gone" />



        <ImageButton android:id="@+id/rxtxVideoCallButton"

            style="@style/InCallButton"

            android:background="@drawable/btn_change_to_video"

            android:contentDescription="@string/overflowBothCallMenuItemText"

            android:visibility="gone" />



        <ImageButton android:id="@+id/rxVedioCallButton"

            style="@style/InCallButton"

            android:background="@drawable/btn_change_to_hm_video"

            android:contentDescription="@string/overflowRXCallMenuItemText"

            android:visibility="gone" />



        <ImageButton android:id="@+id/volteCallButton"

            style="@style/InCallButton"

            android:background="@drawable/btn_compound_audio"

            android:contentDescription="@string/overflowVOCallMenuItemText"

            android:visibility="gone" />



    </LinearLayout>



</LinearLayout>

InCallUI/res/layout/primary_call_info.xml

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 


    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="@dimen/in_call_layout_height"

        android:orientation="horizontal"

        android:clipChildren="false"

        android:clipToPadding="false">
@@ -145,7 +145,7 @@ 
        <ImageView android:id="@+id/hdAudioIcon"

            android:src="@drawable/ic_hd_24dp"

            android:layout_width="24dp"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginEnd="8dp"

            android:tint="@color/incall_call_banner_subtext_color"

            android:scaleType="fitCenter"

InCallUI/res/layout/video_call_views.xml

+8 −4
Original line number Diff line number Diff line
@@ -20,11 +20,15 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent" >



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <TextureView

            android:id="@+id/incomingVideo"

            android:layout_gravity="center"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />

    </FrameLayout>

    <!-- The width and height are replaced at runtime based on the selected camera. -->

    <FrameLayout

        android:id="@+id/previewVideoContainer"