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

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

Promotion of atel.lnx.2.0-00033. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1081341   Ic044ea6b329ece5973c846bb55041bd50e754813   Dailer: Fix dialer app crash issue
967507   Iaf5db4585b0a096eacdfd54036439c49ab89a86b   Dialer: Rotate screen, show Speed Dialer Dialog when it
1089412   Ifaea5c5c3ed70e5654fcb3ff6372681ae14896ac   Fix 4g conference call logs are merged together
1081372   I2f0b3aedfb63756cc2fdaf7f704ad85028ec94de   Dialer: Fix dialer app crash issue due to NPE
1083364   I3a7195794c95ce1877e13500b05877c791bd484a   IMS: Fix Conference URI button visibility issue.
1088763   I167cd4feedea2afd0a25e4a26d9ed5c5d90a59ea   IMS-VT: Show contact photo view when remote side is on h
914710   I292e254ab8090d9fcb739109d29d96078779467e   InCallUI: Add a controller for proximity sensor

Change-Id: Iaead0e829a5412c1e3d371d09576164b8ed9e8e0
CRs-Fixed: 1088763, 1081372, 914710, 1081341, 1089412, 967507, 1083364
parents d1ec7962 97eaae72

InCallUI/src/com/android/incallui/CallCardPresenter.java

+9 −0
Original line number Diff line number Diff line
@@ -1160,6 +1160,15 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> 
        // No-op - the Call Card is the origin of this event.

    }



    @Override

    public void onIncomingVideoAvailabilityChanged(boolean isAvailable) {

        Log.d(this, "onIncomingVideoAvailabilityChanged: available = " + isAvailable);

        if (mPrimary == null) {

            return;

        }

        updatePrimaryDisplayInfo();

    }



    private boolean isPrimaryCallActive() {

        return mPrimary != null && mPrimary.getState() == Call.State.ACTIVE;

    }

InCallUI/src/com/android/incallui/InCallPresenter.java

+10 −0
Original line number Diff line number Diff line
@@ -1381,6 +1381,15 @@ public class InCallPresenter implements CallList.Listener, 
        }

    }



    /**

     * Called by the {@link VideoCallPresenter} to inform of a change in availability of

     * incoming video stream.

     */

    public void notifyIncomingVideoAvailabilityChanged(boolean isAvailable) {

        for (InCallEventListener listener : mInCallEventListeners) {

            listener.onIncomingVideoAvailabilityChanged(isAvailable);

        }

    }



    /**

     * For some disconnected causes, we show a dialog.  This calls into the activity to show
@@ -2091,6 +2100,7 @@ public class InCallPresenter implements CallList.Listener, 
        public void onFullscreenModeChanged(boolean isFullscreenMode);

        public void onSecondaryCallerInfoVisibilityChanged(boolean isVisible, int height);

        public void updatePrimaryCallState();

        public void onIncomingVideoAvailabilityChanged(boolean isAvailable);

    }



    public interface InCallUiListener {

InCallUI/src/com/android/incallui/ProximitySensor.java

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.hardware.display.DisplayManager.DisplayListener; 
import android.os.PowerManager;

import android.telecom.CallAudioState;

import android.view.Display;

import android.provider.Settings;



import com.android.incallui.AudioModeProvider.AudioModeListener;

import com.android.incallui.InCallPresenter.InCallState;
@@ -42,6 +43,7 @@ import com.android.incallui.InCallPresenter.InCallStateListener; 
public class ProximitySensor implements AccelerometerListener.OrientationListener,

        InCallStateListener, AudioModeListener {

    private static final String TAG = ProximitySensor.class.getSimpleName();

    private static final String PROXIMITY_SENSOR = "proximity_sensor";



    private final PowerManager mPowerManager;

    private final PowerManager.WakeLock mProximityWakeLock;
@@ -52,6 +54,7 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene 
    private boolean mUiShowing = false;

    private boolean mIsPhoneOffhook = false;

    private boolean mDialpadVisible;

    private Context mContext;



    // True if the keyboard is currently *not* hidden

    // Gets updated whenever there is a Configuration change
@@ -59,6 +62,7 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene 


    public ProximitySensor(Context context, AudioModeProvider audioModeProvider,

            AccelerometerListener accelerometerListener) {

        mContext = context;

        mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);

        if (mPowerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {

            mProximityWakeLock = mPowerManager.newWakeLock(
@@ -232,6 +236,8 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene 
                    || CallAudioState.ROUTE_SPEAKER == audioMode

                    || CallAudioState.ROUTE_BLUETOOTH == audioMode

                    || mIsHardKeyboardOpen);

            screenOnImmediately |= Settings.System.getInt(mContext.getContentResolver(),

                    PROXIMITY_SENSOR, 1) == 0;



            // We do not keep the screen off when the user is outside in-call screen and we are

            // horizontal, but we do not force it on when we become horizontal until the

InCallUI/src/com/android/incallui/VideoCallPresenter.java

+7 −0
Original line number Diff line number Diff line
@@ -564,6 +564,11 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi 
        getUi().adjustPreviewLocation(isVisible /* shiftUp */, height);

    }



    @Override

    public void onIncomingVideoAvailabilityChanged(boolean isAvailable) {

        //NO OP

    }



    private void checkForVideoStateChange(Call call) {

        boolean isVideoCall = VideoUtils.isVideoCall(call);

        boolean hasVideoStateChanged = mCurrentVideoState != call.getVideoState();
@@ -1094,6 +1099,8 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi 
                    event == Connection.VideoProvider.SESSION_EVENT_RX_RESUME;

                showVideoUi(mCurrentVideoState, mCurrentCallState, isConfCall());

                sb.append(mIsIncomingVideoAvailable ? "rx_resume" : "rx_pause");

                InCallPresenter.getInstance().

                        notifyIncomingVideoAvailabilityChanged(mIsIncomingVideoAvailable);

                break;

            case Connection.VideoProvider.SESSION_EVENT_CAMERA_FAILURE:

                sb.append("camera_failure");

src/com/android/dialer/DialtactsActivity.java

+0 −4
Original line number Diff line number Diff line
@@ -1223,10 +1223,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
        setConferenceDialButtonImage(false);

        setConferenceDialButtonVisibility(true);

        boolean mIsRecipientsShown = mDialpadFragment.isRecipientsShown();

        if(mIsRecipientsShown) {

            mDialpadFragment.hideAndClearDialConference();

        }



        if (mIsDialpadShown || mIsRecipientsShown) {

            if (TextUtils.isEmpty(mSearchQuery) ||

                    (mSmartDialSearchFragment != null && mSmartDialSearchFragment.isVisible()