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

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

Merge edd59c44 on remote branch 

Change-Id: I56bacfcc5fc378610f018e3eb5ada0e9c339737d
parents 2cd1e189 edd59c44

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"