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

Commit e5f505b4 authored by Prerepa Viswanadham's avatar Prerepa Viswanadham
Browse files

Merge commit '5e2731c' into merge_try2

Change-Id: I880eb25812adaeb9355cc9c1dcf46afa0da5f333
parents e37ff679 7c4d3f9c
Loading
Loading
Loading
Loading
+0 −31
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>

<!--
  ~ Copyright (C) 2014 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
  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@+id/backgroundItem"
          android:drawable="@drawable/btn_background" />

    <item>
        <bitmap android:src="@drawable/ic_toolbar_audio_phone"
            android:gravity="center"
            android:tint="@color/selectable_icon_tint"
            android:autoMirrored="true" />
    </item>

</layer-list>
 No newline at end of file
+1 −8
Original line number Diff line number Diff line
@@ -69,13 +69,6 @@
            android:background="@drawable/btn_compound_audio"
            android:contentDescription="@string/audio_mode_speaker" />

        <!-- "Change to audio call" for video calls. -->
        <ImageButton android:id="@+id/changeToVoiceButton"
            style="@style/InCallButton"
            android:background="@drawable/btn_change_to_voice"
            android:contentDescription="@string/onscreenChangeToVoiceText"
            android:visibility="gone" />

        <!-- MIDDLE LEFT SLOT ================================================================== -->

        <!-- "Mute" -->
@@ -145,7 +138,7 @@
            android:contentDescription="@string/onscreenMergeCallsText"
            android:visibility="gone" />

        <!-- "Switch camera" for video calls. -->
        <!-- "Turn off camera" for video calls. -->
        <ToggleButton android:id="@+id/pauseVideoButton"
            style="@style/InCallCompoundButton"
            android:background="@drawable/btn_compound_video_off"
+36 −5
Original line number Diff line number Diff line
@@ -26,10 +26,41 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
    <!-- The width and height are replaced at runtime based on the selected camera. -->
    <FrameLayout
        android:id="@+id/previewVideoContainer"
        android:layout_width="70dp"
        android:layout_height="120dp"
        android:layout_gravity="bottom|right"
        android:layout_margin="@dimen/video_preview_margin" >

        <!-- The video preview surface, where the user's outgoing video is shown. -->
        <TextureView
            android:id="@+id/previewVideo"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />

        <!-- The user's profile photo, shown when the user's camera is shut off. -->
        <ImageView
            android:id="@+id/previewProfilePhoto"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:scaleType="centerInside"
            android:adjustViewBounds="false"
            android:contentDescription="@string/profile_photo_description"
            android:background="@android:color/black"
            android:visibility="gone" />

        <!-- The "camera off" icon, shown when the user's camera is shut off. -->
        <ImageView
            android:id="@+id/previewCameraOff"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="bottom|right"
        android:layout_margin="@dimen/video_preview_margin"
        android:layout_width="70dp"
        android:layout_height="120dp" />
            android:layout_marginEnd="10dp"
            android:layout_marginBottom="10dp"
            android:scaleType="centerCrop"
            android:contentDescription="@string/camera_off_description"
            android:src="@drawable/ic_toolbar_video_off"
            android:visibility="gone" />
    </FrameLayout>
</FrameLayout>
+8 −18
Original line number Diff line number Diff line
@@ -294,13 +294,6 @@
    <!-- Text for the onscreen overflow button, to see additional actions which can be done. -->
    <string name="onscreenOverflowText">More options</string>

    <!-- STOPSHIP -  For test only - In-call screen: Modify Call Options for IMS call -->
    <string name="modify_call_option_title" translatable="false">Which type of call?</string>
    <string name="modify_call_option_vt" translatable="false">Video bidirectional</string>
    <string name="modify_call_option_vt_tx" translatable="false">Video transmit</string>
    <string name="modify_call_option_vt_rx" translatable="false">Video receive</string>
    <string name="modify_call_option_voice" translatable="false">Voice Only</string>

    <!-- Message indicating that Video Started flowing for IMS-VT calls -->
    <string name="player_started">Player Started</string>
    <!-- Message indicating that Video Stopped flowing for IMS-VT calls -->
@@ -440,17 +433,6 @@
    <!-- This can be used in any application wanting to disable the text "Emergency number" -->
    <string name="emergency_call_dialog_number_for_display">Emergency number</string>

    <!-- Video quality changed message -->
    <string name="video_quality_changed" translatable="false">Video quality changed to \u0020</string>
    <!-- Video quality High -->
    <string name="video_quality_high" translatable="false">High</string>
    <!-- Video quality Medium -->
    <string name="video_quality_medium" translatable="false">Medium</string>
    <!-- Video quality Low -->
    <string name="video_quality_low" translatable="false">Low</string>
    <!-- Video quality Unknown -->
    <string name="video_quality_unknown" translatable="false">Unknown</string>

    <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
    <plurals name="duration_seconds">
        <item quantity="one">1 second</item>
@@ -466,4 +448,12 @@
        <item quantity="one">1 hour</item>
        <item quantity="other"><xliff:g id="count">%d</xliff:g> hours</item>
    </plurals>

    <!-- Description of the profile photo shown when the device's camera is disabled udring a video
        call. [CHAR LIMIT=NONE] -->
    <string name="profile_photo_description">Profile photo</string>

    <!-- Description of the "camera off" icon displayed when the device's camera is disabled during
         a video call. [CHAR LIMIT=NONE] -->
    <string name="camera_off_description">Camera off</string>
</resources>
+4 −8
Original line number Diff line number Diff line
@@ -266,17 +266,13 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi>
    }

    private void configureAnswerTargetsForSms(Call call, List<String> textMsgs) {
        if (getUi() == null) {
            return;
        }

        final Context context = getUi().getContext();

        mHasTextMessages = textMsgs != null;
        boolean withSms =
                call.can(android.telecom.Call.Details.CAPABILITY_RESPOND_VIA_TEXT)
                && mHasTextMessages;
        if (call.isVideoCall(context)) {

        // Only present the user with the option to answer as a video call if the incoming call is
        // a bi-directional video call.
        if (VideoProfile.VideoState.isBidirectional((call.getVideoState()))) {
            if (withSms) {
                getUi().showTargets(AnswerFragment.TARGET_SET_FOR_VIDEO_WITH_SMS);
                getUi().configureMessageDialog(textMsgs);
Loading