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

Commit 115b9c37 authored by Lalit Kansara's avatar Lalit Kansara
Browse files

Merge commit '9bdcff7b' into remote 

Conflicts:
	AndroidManifest.xml
	InCallUI/src/com/android/incallui/Call.java
	InCallUI/src/com/android/incallui/CallButtonPresenter.java
	InCallUI/src/com/android/incallui/NotificationBroadcastReceiver.java
	InCallUI/src/com/android/incallui/StatusBarNotifier.java
	InCallUI/src/com/android/incallui/VideoCallPresenter.java

Change-Id: Ice78377f619bcd740170eff4393102329319f43d
parents 03ebc3fe 9bdcff7b

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ src_dirs := src \ 
res_dirs := res \

    $(incallui_dir)/res \

    $(contacts_common_dir)/res \

    $(contacts_common_dir)/icons/res \

    $(phone_common_dir)/res



src_dirs += \

AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ 
        <activity android:name="com.android.dialer.CallDetailActivity"

            android:label="@string/callDetailTitle"

            android:theme="@style/CallDetailActivityTheme"

            android:icon="@mipmap/ic_launcher_phone"

            android:parentActivityName="com.android.dialer.calllog.CallLogActivity">

            android:parentActivityName="com.android.dialer.calllog.CallLogActivity"

            android:icon="@mipmap/ic_launcher_phone">

            <intent-filter>

                <action android:name="android.intent.action.VIEW"/>

                <category android:name="android.intent.category.DEFAULT"/>
@@ -341,6 +341,8 @@ 
            <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />

            <meta-data android:name="android.telecom.IN_CALL_SERVICE_RINGING"

                android:value="false"/>

            <meta-data android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"

                       android:value="true"/>

            <intent-filter>

                <action android:name="android.telecom.InCallService"/>

            </intent-filter>

InCallUI/res/layout/call_button_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
        <ToggleButton android:id="@+id/pauseVideoButton"

            style="@style/InCallCompoundButton"

            android:background="@drawable/btn_compound_video_off"

            android:contentDescription="@string/onscreenPauseVideoText"

            android:contentDescription="@string/onscreenTurnOffCameraText"

            android:visibility="gone" />



        <!-- "Change to audio call" for video calls. -->

InCallUI/res/values-af/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ 
    <string name="notification_action_dismiss" msgid="1998811618480434300">"Maak toe"</string>

    <string name="notification_missedCall_call_back" msgid="7855043480614703539">"Bel terug"</string>

    <string name="notification_missedCall_message" msgid="2407410183079324393">"Boodskap"</string>

    <string name="notification_external_call" msgid="5611236780302924816">"Voortgesette oproep op \'n ander toestel"</string>

    <string name="notification_transfer_call" msgid="687009078741947505">"Sit oproep deur"</string>

    <string name="incall_error_power_off" msgid="3626117639377110403">"Skakel vliegtuigmodus eers af om \'n oproep te maak."</string>

    <string name="incall_error_emergency_only" msgid="8704761887752183855">"Nie geregistreer op netwerk nie."</string>

    <string name="incall_error_out_of_service" msgid="1830319376612608339">"Sellulêre netwerk is nie beskikbaar nie."</string>
@@ -121,7 +123,8 @@ 
    <string name="onscreenVideoCallText" msgid="1578940167445068369">"Video-oproep"</string>

    <string name="onscreenChangeToVoiceText" msgid="6249580619992009182">"Verander na stemoproep"</string>

    <string name="onscreenSwitchCameraText" msgid="7141261218152736690">"Wissel kamera"</string>

    <string name="onscreenPauseVideoText" msgid="1268768027709892604">"Laat video wag"</string>

    <string name="onscreenTurnOnCameraText" msgid="915019986687927588">"Skakel kamera aan"</string>

    <string name="onscreenTurnOffCameraText" msgid="6225377831394679126">"Skakel kamera af"</string>

    <string name="onscreenOverflowText" msgid="7932741239724473887">"Nog opsies"</string>

    <string name="player_started" msgid="3478865572468310331">"Speler het begin"</string>

    <string name="player_stopped" msgid="1278611664986561535">"Speler het gestop"</string>

InCallUI/res/values-am/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ 
    <string name="notification_action_dismiss" msgid="1998811618480434300">"አስወግድ"</string>

    <string name="notification_missedCall_call_back" msgid="7855043480614703539">"መልሰህ ደውል"</string>

    <string name="notification_missedCall_message" msgid="2407410183079324393">"መልእክት"</string>

    <string name="notification_external_call" msgid="5611236780302924816">"በሌላ መሳሪያ ጥሪ በመካሄድ ላይ ነው"</string>

    <string name="notification_transfer_call" msgid="687009078741947505">"ጥሪ አስተላልፍ"</string>

    <string name="incall_error_power_off" msgid="3626117639377110403">"ለመደወል፣ መጀመሪያ የአውሮፕላኑን ሁኔታ ያጥፉ።"</string>

    <string name="incall_error_emergency_only" msgid="8704761887752183855">"በአውታረ መረቡ ላይ አልተመዘገበም።"</string>

    <string name="incall_error_out_of_service" msgid="1830319376612608339">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም።"</string>
@@ -121,7 +123,8 @@ 
    <string name="onscreenVideoCallText" msgid="1578940167445068369">"የቪዲዮ ጥሪ"</string>

    <string name="onscreenChangeToVoiceText" msgid="6249580619992009182">"ወደ ድምፅ ጥሪ ይለውጡ"</string>

    <string name="onscreenSwitchCameraText" msgid="7141261218152736690">"ካሜራ ቀይር"</string>

    <string name="onscreenPauseVideoText" msgid="1268768027709892604">"ቪድዮ ለአፍታ አቁም"</string>

    <string name="onscreenTurnOnCameraText" msgid="915019986687927588">"ካሜራ ያብሩ"</string>

    <string name="onscreenTurnOffCameraText" msgid="6225377831394679126">"ካሜራ ያጥፉ"</string>

    <string name="onscreenOverflowText" msgid="7932741239724473887">"ተጨማሪ አማራጮች"</string>

    <string name="player_started" msgid="3478865572468310331">"አጫዋች ጀምሯል"</string>

    <string name="player_stopped" msgid="1278611664986561535">"አጫዋች ቆሟል"</string>