Merge changes I6e7c349d,If6c74b3b,Ib276e9dc,Ida0f7cc0 into main
* changes: Override DisplayController on main thread. Add annotations for manipulating secure settings. Don't use UiThreadTest for Taskbar Unit tests. Suspend Launcher taskbar while removed for tests.
This commit is contained in:
committed by
Android (Google) Code Review
commit
f7ca8d60be
@@ -43,6 +43,8 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_N
|
||||
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING;
|
||||
import static com.android.wm.shell.Flags.enableTinyTaskbar;
|
||||
|
||||
import static java.lang.invoke.MethodHandles.Lookup.PROTECTED;
|
||||
|
||||
import android.animation.AnimatorSet;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.app.ActivityOptions;
|
||||
@@ -1515,7 +1517,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
|
||||
return mIsNavBarKidsMode && isThreeButtonNav();
|
||||
}
|
||||
|
||||
protected boolean isNavBarForceVisible() {
|
||||
@VisibleForTesting(otherwise = PROTECTED)
|
||||
public boolean isNavBarForceVisible() {
|
||||
return mIsNavBarForceVisible;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user