Revert "Listen to LauncherUserInfo config changes and hide/unhid..."
Revert submission 29352757-update-usericoninfo Reason for revert: <DroidMonitor created revert due to b/379000263. Will be verified through ABTD for standard investigation.> Reverted changes: /q/submissionid:29352757-update-usericoninfo Change-Id: I751536274ec9dcc4047bf9c76b3a5cab258da6e4
This commit is contained in:
committed by
Android (Google) Code Review
parent
39dee43e12
commit
41743bd0c7
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.launcher3.allapps;
|
||||
|
||||
import static android.content.pm.LauncherUserInfo.PRIVATE_SPACE_ENTRYPOINT_HIDDEN;
|
||||
import static android.view.View.GONE;
|
||||
import static android.view.View.INVISIBLE;
|
||||
import static android.view.View.VISIBLE;
|
||||
@@ -44,7 +43,6 @@ import android.animation.AnimatorListenerAdapter;
|
||||
import android.animation.AnimatorSet;
|
||||
import android.animation.ObjectAnimator;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.UserHandle;
|
||||
@@ -80,13 +78,11 @@ import com.android.launcher3.pm.UserCache;
|
||||
import com.android.launcher3.util.ApiWrapper;
|
||||
import com.android.launcher3.util.Preconditions;
|
||||
import com.android.launcher3.util.SettingsCache;
|
||||
import com.android.launcher3.util.UserIconInfo;
|
||||
import com.android.launcher3.views.ActivityContext;
|
||||
import com.android.launcher3.views.RecyclerViewFastScroller;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
/**
|
||||
@@ -213,20 +209,9 @@ public class PrivateProfileManager extends UserProfileManager {
|
||||
}
|
||||
|
||||
/** Whether private profile should be hidden on Launcher. */
|
||||
@SuppressLint("NewApi")
|
||||
public boolean isPrivateSpaceHidden() {
|
||||
UserHandle profileHandle = getProfileUser();
|
||||
if (android.multiuser.Flags.addLauncherUserConfig() && !Objects.isNull(profileHandle)) {
|
||||
UserIconInfo userInconInfo = UserCache.INSTANCE.get(mAllApps.getContext()).getUserInfo(
|
||||
profileHandle);
|
||||
|
||||
return getCurrentState() == STATE_DISABLED && userInconInfo.getUserConfig().getBoolean(
|
||||
PRIVATE_SPACE_ENTRYPOINT_HIDDEN, false);
|
||||
}
|
||||
|
||||
return getCurrentState() == STATE_DISABLED && SettingsCache.INSTANCE.get(
|
||||
mAllApps.getContext()).getValue(PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI, 0);
|
||||
|
||||
return getCurrentState() == STATE_DISABLED && SettingsCache.INSTANCE
|
||||
.get(mAllApps.getContext()).getValue(PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user