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

Commit 346a71da authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes from topic "change-13630081" into sc-dev 

* changes:
  Revert^2 "Remove final calls to Dependency.get from keyguard."
  Revert^2 "Remove Dependency.get from KeyguardStatusView."
  Revert^2 "Add injection to ClockProvider."
  Revert^2 "Remove Dependency.get from KeyguardSliceTextView."
  Revert^2 "Add Controller for Emergency Button."
  Revert^2 "Add ViewController to CarrierText."
  Create central TelephonyListenerManager.
parents 133e6cfe 23e9e537

packages/SystemUI/src/com/android/keyguard/CarrierText.java

+11 −54
Original line number Diff line number Diff line
@@ -24,41 +24,14 @@ import android.util.AttributeSet; 
import android.view.View;

import android.widget.TextView;



import com.android.systemui.Dependency;

import com.android.systemui.R;



import java.util.Locale;



public class CarrierText extends TextView {

    private static final boolean DEBUG = KeyguardConstants.DEBUG;

    private static final String TAG = "CarrierText";

    private final boolean mShowMissingSim;



    private static CharSequence mSeparator;



    private boolean mShowMissingSim;



    private boolean mShowAirplaneMode;

    private boolean mShouldMarquee;



    private CarrierTextController mCarrierTextController;



    private CarrierTextController.CarrierTextCallback mCarrierTextCallback =

            new CarrierTextController.CarrierTextCallback() {

                @Override

                public void updateCarrierInfo(CarrierTextController.CarrierTextCallbackInfo info) {

                    setText(info.carrierText);

                }



                @Override

                public void startedGoingToSleep() {

                    setSelected(false);

                }



                @Override

                public void finishedWakingUp() {

                    setSelected(true);

                }

            };

    private final boolean mShowAirplaneMode;



    public CarrierText(Context context) {

        this(context, null);
@@ -78,30 +51,6 @@ public class CarrierText extends TextView { 
        }

        setTransformationMethod(new CarrierTextTransformationMethod(mContext, useAllCaps));

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mSeparator = getResources().getString(

                com.android.internal.R.string.kg_text_message_separator);

        mCarrierTextController = new CarrierTextController(mContext, mSeparator, mShowAirplaneMode,

                mShowMissingSim);

        mShouldMarquee = Dependency.get(KeyguardUpdateMonitor.class).isDeviceInteractive();

        setSelected(mShouldMarquee); // Allow marquee to work.

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mCarrierTextController.setListening(mCarrierTextCallback);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mCarrierTextController.setListening(null);

    }



    @Override

    protected void onVisibilityChanged(View changedView, int visibility) {

        super.onVisibilityChanged(changedView, visibility);
@@ -113,7 +62,15 @@ public class CarrierText extends TextView { 
        }

    }



    private class CarrierTextTransformationMethod extends SingleLineTransformationMethod {

    public boolean getShowAirplaneMode() {

        return mShowAirplaneMode;

    }



    public boolean getShowMissingSim() {

        return mShowMissingSim;

    }



    private static class CarrierTextTransformationMethod extends SingleLineTransformationMethod {

        private final Locale mLocale;

        private final boolean mAllCaps;

packages/SystemUI/src/com/android/keyguard/CarrierTextController.java

+36 −656

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java

0 → 100644
+721 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/keyguard/EmergencyButton.java

+4 −136
Original line number Diff line number Diff line
@@ -16,34 +16,16 @@ 


package com.android.keyguard;



import static com.android.systemui.DejankUtils.whitelistIpcs;



import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Slog;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewConfiguration;

import android.widget.Button;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.util.EmergencyAffordanceManager;

import com.android.internal.widget.LockPatternUtils;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.util.EmergencyDialerConstants;



/**

 * This class implements a smart emergency button that updates itself based
@@ -53,34 +35,14 @@ import com.android.systemui.util.EmergencyDialerConstants; 
 */

public class EmergencyButton extends Button {



    private static final String LOG_TAG = "EmergencyButton";

    private final EmergencyAffordanceManager mEmergencyAffordanceManager;



    private int mDownX;

    private int mDownY;

    KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() {



        @Override

        public void onSimStateChanged(int subId, int slotId, int simState) {

            updateEmergencyCallButton();

        }



        @Override

        public void onPhoneStateChanged(int phoneState) {

            updateEmergencyCallButton();

        }

    };

    private boolean mLongPressWasDragged;



    public interface EmergencyButtonCallback {

        public void onEmergencyButtonClickedWhenInCall();

    }



    private LockPatternUtils mLockPatternUtils;

    private PowerManager mPowerManager;

    private EmergencyButtonCallback mEmergencyButtonCallback;



    private final boolean mIsVoiceCapable;

    private final boolean mEnableEmergencyCallWhileSimLocked;



    public EmergencyButton(Context context) {
@@ -89,34 +51,15 @@ public class EmergencyButton extends Button { 


    public EmergencyButton(Context context, AttributeSet attrs) {

        super(context, attrs);

        mIsVoiceCapable = getTelephonyManager().isVoiceCapable();

        mEnableEmergencyCallWhileSimLocked = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_enable_emergency_call_while_sim_locked);

        mEmergencyAffordanceManager = new EmergencyAffordanceManager(context);

    }



    private TelephonyManager getTelephonyManager() {

        return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        Dependency.get(KeyguardUpdateMonitor.class).registerCallback(mInfoCallback);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        Dependency.get(KeyguardUpdateMonitor.class).removeCallback(mInfoCallback);

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mLockPatternUtils = new LockPatternUtils(mContext);

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

        setOnClickListener(v -> takeEmergencyCallAction());

        if (mEmergencyAffordanceManager.needsEmergencyAffordance()) {

            setOnLongClickListener(v -> {

                if (!mLongPressWasDragged
@@ -127,7 +70,6 @@ public class EmergencyButton extends Button { 
                return false;

            });

        }

        whitelistIpcs(this::updateEmergencyCallButton);

    }



    @Override
@@ -165,65 +107,13 @@ public class EmergencyButton extends Button { 
        return super.performLongClick();

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        updateEmergencyCallButton();

    }



    /**

     * Shows the emergency dialer or returns the user to the existing call.

     */

    public void takeEmergencyCallAction() {

        MetricsLogger.action(mContext, MetricsEvent.ACTION_EMERGENCY_CALL);

        if (mPowerManager != null) {

            mPowerManager.userActivity(SystemClock.uptimeMillis(), true);

        }

        try {

            ActivityTaskManager.getService().stopSystemLockTaskMode();

        } catch (RemoteException e) {

            Slog.w(LOG_TAG, "Failed to stop app pinning");

        }

        if (isInCall()) {

            resumeCall();

            if (mEmergencyButtonCallback != null) {

                mEmergencyButtonCallback.onEmergencyButtonClickedWhenInCall();

            }

        } else {

            KeyguardUpdateMonitor updateMonitor = Dependency.get(KeyguardUpdateMonitor.class);

            if (updateMonitor != null) {

                updateMonitor.reportEmergencyCallAction(true /* bypassHandler */);

            } else {

                Log.w(LOG_TAG, "KeyguardUpdateMonitor was null, launching intent anyway.");

            }

            TelecomManager telecomManager = getTelecommManager();

            if (telecomManager == null) {

                Log.wtf(LOG_TAG, "TelecomManager was null, cannot launch emergency dialer");

                return;

            }

            Intent emergencyDialIntent =

                    telecomManager.createLaunchEmergencyDialerIntent(null /* number*/)

                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS

                                    | Intent.FLAG_ACTIVITY_CLEAR_TOP)

                            .putExtra(EmergencyDialerConstants.EXTRA_ENTRY_TYPE,

                                    EmergencyDialerConstants.ENTRY_TYPE_LOCKSCREEN_BUTTON);



            getContext().startActivityAsUser(emergencyDialIntent,

                    ActivityOptions.makeCustomAnimation(getContext(), 0, 0).toBundle(),

                    new UserHandle(KeyguardUpdateMonitor.getCurrentUser()));

        }

    }



    private void updateEmergencyCallButton() {

    void updateEmergencyCallButton(boolean isInCall, boolean isVoiceCapable, boolean simLocked) {

        boolean visible = false;

        if (mIsVoiceCapable) {

        if (isVoiceCapable) {

            // Emergency calling requires voice capability.

            if (isInCall()) {

            if (isInCall) {

                visible = true; // always show "return to call" if phone is off-hook

            } else {

                final boolean simLocked = Dependency.get(KeyguardUpdateMonitor.class)

                        .isSimPinVoiceSecure();

                if (simLocked) {

                    // Some countries can't handle emergency calls while SIM is locked.

                    visible = mEnableEmergencyCallWhileSimLocked;
@@ -237,7 +127,7 @@ public class EmergencyButton extends Button { 
            setVisibility(View.VISIBLE);



            int textId;

            if (isInCall()) {

            if (isInCall) {

                textId = com.android.internal.R.string.lockscreen_return_to_call;

            } else {

                textId = com.android.internal.R.string.lockscreen_emergency_call;
@@ -247,26 +137,4 @@ public class EmergencyButton extends Button { 
            setVisibility(View.GONE);

        }

    }



    public void setCallback(EmergencyButtonCallback callback) {

        mEmergencyButtonCallback = callback;

    }



    /**

     * Resumes a call in progress.

     */

    private void resumeCall() {

        getTelecommManager().showInCallScreen(false);

    }



    /**

     * @return {@code true} if there is a call currently in progress.

     */

    private boolean isInCall() {

        return getTelecommManager().isInCall();

    }



    private TelecomManager getTelecommManager() {

        return (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);

    }

}

packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java

0 → 100644
+196 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */



package com.android.keyguard;



import static com.android.systemui.DejankUtils.whitelistIpcs;



import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.content.Intent;

import android.content.res.Configuration;

import android.os.PowerManager;

import android.os.SystemClock;

import android.os.UserHandle;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;

import android.util.Log;



import androidx.annotation.Nullable;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.keyguard.dagger.KeyguardBouncerScope;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;

import com.android.systemui.util.EmergencyDialerConstants;

import com.android.systemui.util.ViewController;



import javax.inject.Inject;



/** View Controller for {@link com.android.keyguard.EmergencyButton}. */

@KeyguardBouncerScope

public class EmergencyButtonController extends ViewController<EmergencyButton> {

    static final String LOG_TAG = "EmergencyButton";

    private final ConfigurationController mConfigurationController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final TelephonyManager mTelephonyManager;

    private final PowerManager mPowerManager;

    private final ActivityTaskManager mActivityTaskManager;

    private final TelecomManager mTelecomManager;

    private final MetricsLogger mMetricsLogger;



    private EmergencyButtonCallback mEmergencyButtonCallback;



    private final KeyguardUpdateMonitorCallback mInfoCallback =

            new KeyguardUpdateMonitorCallback() {

        @Override

        public void onSimStateChanged(int subId, int slotId, int simState) {

            updateEmergencyCallButton();

        }



        @Override

        public void onPhoneStateChanged(int phoneState) {

            updateEmergencyCallButton();

        }

    };



    private final ConfigurationListener mConfigurationListener = new ConfigurationListener() {

        @Override

        public void onConfigChanged(Configuration newConfig) {

            updateEmergencyCallButton();

        }

    };



    private EmergencyButtonController(@Nullable EmergencyButton view,

            ConfigurationController configurationController,

            KeyguardUpdateMonitor keyguardUpdateMonitor, TelephonyManager telephonyManager,

            PowerManager powerManager, ActivityTaskManager activityTaskManager,

            @Nullable TelecomManager telecomManager, MetricsLogger metricsLogger) {

        super(view);

        mConfigurationController = configurationController;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mTelephonyManager = telephonyManager;

        mPowerManager = powerManager;

        mActivityTaskManager = activityTaskManager;

        mTelecomManager = telecomManager;

        mMetricsLogger = metricsLogger;

    }



    @Override

    protected void onInit() {

        whitelistIpcs(this::updateEmergencyCallButton);

    }



    @Override

    protected void onViewAttached() {

        mKeyguardUpdateMonitor.registerCallback(mInfoCallback);

        mConfigurationController.addCallback(mConfigurationListener);

        mView.setOnClickListener(v -> takeEmergencyCallAction());

    }



    @Override

    protected void onViewDetached() {

        mKeyguardUpdateMonitor.removeCallback(mInfoCallback);

        mConfigurationController.removeCallback(mConfigurationListener);

    }



    private void updateEmergencyCallButton() {

        if (mView != null) {

            mView.updateEmergencyCallButton(

                    mTelecomManager != null && mTelecomManager.isInCall(),

                    mTelephonyManager.isVoiceCapable(),

                    mKeyguardUpdateMonitor.isSimPinVoiceSecure());

        }

    }



    public void setEmergencyButtonCallback(EmergencyButtonCallback callback) {

        mEmergencyButtonCallback = callback;

    }

    /**

     * Shows the emergency dialer or returns the user to the existing call.

     */

    public void takeEmergencyCallAction() {

        mMetricsLogger.action(MetricsEvent.ACTION_EMERGENCY_CALL);

        if (mPowerManager != null) {

            mPowerManager.userActivity(SystemClock.uptimeMillis(), true);

        }

        mActivityTaskManager.stopSystemLockTaskMode();

        if (mTelecomManager != null && mTelecomManager.isInCall()) {

            mTelecomManager.showInCallScreen(false);

            if (mEmergencyButtonCallback != null) {

                mEmergencyButtonCallback.onEmergencyButtonClickedWhenInCall();

            }

        } else {

            mKeyguardUpdateMonitor.reportEmergencyCallAction(true /* bypassHandler */);

            if (mTelecomManager == null) {

                Log.wtf(LOG_TAG, "TelecomManager was null, cannot launch emergency dialer");

                return;

            }

            Intent emergencyDialIntent =

                    mTelecomManager.createLaunchEmergencyDialerIntent(null /* number*/)

                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS

                                    | Intent.FLAG_ACTIVITY_CLEAR_TOP)

                            .putExtra(EmergencyDialerConstants.EXTRA_ENTRY_TYPE,

                                    EmergencyDialerConstants.ENTRY_TYPE_LOCKSCREEN_BUTTON);



            getContext().startActivityAsUser(emergencyDialIntent,

                    ActivityOptions.makeCustomAnimation(getContext(), 0, 0).toBundle(),

                    new UserHandle(KeyguardUpdateMonitor.getCurrentUser()));

        }

    }



    /** */

    public interface EmergencyButtonCallback {

        /** */

        void onEmergencyButtonClickedWhenInCall();

    }



    /** Injectable Factory for creating {@link EmergencyButtonController}. */

    public static class Factory {

        private final ConfigurationController mConfigurationController;

        private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

        private final TelephonyManager mTelephonyManager;

        private final PowerManager mPowerManager;

        private final ActivityTaskManager mActivityTaskManager;

        @Nullable

        private final TelecomManager mTelecomManager;

        private final MetricsLogger mMetricsLogger;



        @Inject

        public Factory(ConfigurationController configurationController,

                KeyguardUpdateMonitor keyguardUpdateMonitor, TelephonyManager telephonyManager,

                PowerManager powerManager, ActivityTaskManager activityTaskManager,

                @Nullable TelecomManager telecomManager, MetricsLogger metricsLogger) {



            mConfigurationController = configurationController;

            mKeyguardUpdateMonitor = keyguardUpdateMonitor;

            mTelephonyManager = telephonyManager;

            mPowerManager = powerManager;

            mActivityTaskManager = activityTaskManager;

            mTelecomManager = telecomManager;

            mMetricsLogger = metricsLogger;

        }



        /** Construct an {@link com.android.keyguard.EmergencyButtonController}. */

        public EmergencyButtonController create(EmergencyButton view) {

            return new EmergencyButtonController(view, mConfigurationController,

                    mKeyguardUpdateMonitor, mTelephonyManager, mPowerManager, mActivityTaskManager,

                    mTelecomManager, mMetricsLogger);

        }

    }

}