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

Commit 1437a142 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO" am: 3d6736d0 am: 8966a5dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfab465cbb08d4f34d6b174e1efd0606505c4154
parents 2c23216d 8966a5dd

packages/SystemUI/AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -602,7 +602,8 @@ 




        <service

        <service

            android:name=".keyguard.KeyguardService"

            android:name=".keyguard.KeyguardService"

            android:exported="true" />

            android:exported="true"

            android:enabled="@bool/config_enableKeyguardService" />





        <activity android:name=".keyguard.WorkLockActivity"

        <activity android:name=".keyguard.WorkLockActivity"

                  android:label="@string/accessibility_desc_work_lock"

                  android:label="@string/accessibility_desc_work_lock"

packages/SystemUI/res/values-television/config.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -42,7 +42,4 @@ 
        <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>

        <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>

        <item>com.android.systemui.toast.ToastUI</item>

        <item>com.android.systemui.toast.ToastUI</item>

    </string-array>

    </string-array>



    <!-- Svelte specific logic, see RecentsConfiguration.SVELTE_* constants. -->

    <integer name="recents_svelte_level">3</integer>

</resources>
 
</resources>

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,9 @@ 
    <!-- Animation duration when using long press on recents to dock -->

    <!-- Animation duration when using long press on recents to dock -->

    <integer name="long_press_dock_anim_duration">250</integer>

    <integer name="long_press_dock_anim_duration">250</integer>





    <!-- Whether to enable KeyguardService or not -->

    <bool name="config_enableKeyguardService">true</bool>



    <!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow

    <!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow

     card. -->

     card. -->

    <integer name="keyguard_max_notification_count">3</integer>

    <integer name="keyguard_max_notification_count">3</integer>

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −13
Original line number Original line Diff line number Diff line
@@ -34,12 +34,10 @@ import android.app.PendingIntent; 
import android.app.StatusBarManager;

import android.app.StatusBarManager;

import android.app.trust.TrustManager;

import android.app.trust.TrustManager;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentFilter;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.hardware.biometrics.BiometricSourceType;

import android.hardware.biometrics.BiometricSourceType;

import android.media.AudioAttributes;

import android.media.AudioAttributes;
@@ -91,7 +89,6 @@ import com.android.systemui.SystemUIFactory; 
import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.qualifiers.UiBackground;

import com.android.systemui.dagger.qualifiers.UiBackground;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardService;

import com.android.systemui.keyguard.dagger.KeyguardModule;

import com.android.systemui.keyguard.dagger.KeyguardModule;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.shared.system.QuickStepContract;
@@ -787,7 +784,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 




        // Assume keyguard is showing (unless it's disabled) until we know for sure, unless Keyguard

        // Assume keyguard is showing (unless it's disabled) until we know for sure, unless Keyguard

        // is disabled.

        // is disabled.

        if (isKeyguardServiceEnabled()) {

        if (mContext.getResources().getBoolean(R.bool.config_enableKeyguardService)) {

            setShowingLocked(!shouldWaitForProvisioning()

            setShowingLocked(!shouldWaitForProvisioning()

                    && !mLockPatternUtils.isLockScreenDisabled(

                    && !mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser()), true /* forceCallbacks */);

                            KeyguardUpdateMonitor.getCurrentUser()), true /* forceCallbacks */);
@@ -965,15 +962,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
        mUpdateMonitor.dispatchFinishedGoingToSleep(why);

        mUpdateMonitor.dispatchFinishedGoingToSleep(why);

    }

    }





    private boolean isKeyguardServiceEnabled() {

        try {

            return mContext.getPackageManager().getServiceInfo(

                    new ComponentName(mContext, KeyguardService.class), 0).isEnabled();

        } catch (NameNotFoundException e) {

            return true;

        }

    }



    private long getLockTimeout(int userId) {

    private long getLockTimeout(int userId) {

        // if the screen turned off because of timeout or the user hit the power button

        // if the screen turned off because of timeout or the user hit the power button

        // and we don't need to lock immediately, set an alarm

        // and we don't need to lock immediately, set an alarm