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

Commit 4edc5bf4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable smartspace transition on tablet." into tm-dev am: c648c3a7 am: 413ad84f 

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



Change-Id: I342857b57e4d445a12fa97bf9c955d31f6931341
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b8a016d 413ad84f

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+7 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.flags.Flags

import com.android.systemui.plugins.BcSmartspaceDataPlugin

import com.android.systemui.plugins.BcSmartspaceDataPlugin

import com.android.systemui.shared.recents.utilities.Utilities

import com.android.systemui.shared.system.ActivityManagerWrapper

import com.android.systemui.shared.system.ActivityManagerWrapper

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

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

import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController

import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController
@@ -819,6 +820,12 @@ class KeyguardUnlockAnimationController @Inject constructor( 
            return false

            return false

        }

        }





        // We don't do the shared element on tablets because they're large and the smartspace has to

        // fly across large distances, which is distracting.

        if (Utilities.isTablet(context)) {

            return false

        }



        return true

        return true

    }

    }