PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove settings_work_profile feature flag"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-16 15:10:17 +00:00
committed by Android (Google) Code Review
parent 5f4fadb949 3fbdf34a03
commit 5f964f1886
6 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/Utils.java
View File

@@ -81,7 +81,6 @@ import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.style.TtsSpan;
import android.util.ArraySet;
import android.util.FeatureFlagUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.LayoutInflater;
@@ -101,7 +100,6 @@ import androidx.preference.PreferenceGroup;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.util.ArrayUtils;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.profileselector.ProfileFragmentBridge;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -1051,8 +1049,7 @@ public final class Utils extends com.android.settingslib.Utils {
== ProfileSelectFragment.ProfileType.PERSONAL : false;
final boolean isWork = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
== ProfileSelectFragment.ProfileType.WORK : false;
if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.PERSONAL_WORK_PROFILE)
&& activity.getSystemService(UserManager.class).getUserProfiles().size() > 1
if (activity.getSystemService(UserManager.class).getUserProfiles().size() > 1
&& ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName) != null
&& !isWork && !isPersonal) {
f = Fragment.instantiate(activity, ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName),

1
src/com/android/settings/core/FeatureFlags.java
View File

@@ -26,7 +26,6 @@ public class FeatureFlags {
public static final String SETTINGS_FUSE_FLAG = "settings_fuse";
public static final String WIFI_DETAILS_DATAUSAGE_HEADER =
"settings_wifi_details_datausage_header";
public static final String PERSONAL_WORK_PROFILE = "settings_work_profile";
public static final String CONTROLLER_ENHANCEMENT = "settings_controller_loading_enhancement";
public static final String CONDITIONAL_CARDS = "settings_conditionals";
}

8
src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.os.UserManager;
import android.util.FeatureFlagUtils;
import android.util.SparseArray;
import androidx.annotation.NonNull;
@@ -30,7 +29,6 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -70,10 +68,6 @@ public class SecondaryUserController extends AbstractPreferenceController implem
Context context, UserManager userManager) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
if (FeatureFlagUtils.isEnabled(context, FeatureFlags.PERSONAL_WORK_PROFILE)) {
controllers.add(new NoSecondaryUserController(context));
return controllers;
}
UserInfo primaryUser = userManager.getPrimaryUser();
boolean addedUser = false;
List<UserInfo> infos = userManager.getUsers();
@@ -84,8 +78,6 @@ public class SecondaryUserController extends AbstractPreferenceController implem
}
if (info == null || Utils.isProfileOf(primaryUser, info)) {
controllers.add(
new UserProfileController(context, info, USER_PROFILE_INSERTION_LOCATION));
continue;
}

20
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -30,7 +30,6 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.VolumeInfo;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.util.SparseArray;
@@ -44,10 +43,8 @@ import com.android.settings.Settings;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;
import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settings.overlay.FeatureFactory;
@@ -438,19 +435,10 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
}
private Bundle getWorkAnnotatedBundle(int additionalCapacity) {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.PERSONAL_WORK_PROFILE)) {
final Bundle args = new Bundle(1 + additionalCapacity);
args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB,
mIsWorkProfile ? WORK_TAB : PERSONAL_TAB);
return args;
} else {
final Bundle args = new Bundle(2 + additionalCapacity);
args.putInt(ProfileSelectFragment.EXTRA_PROFILE,
mIsWorkProfile ? ProfileSelectFragment.ProfileType.WORK
: ProfileSelectFragment.ProfileType.ALL);
args.putInt(ManageApplications.EXTRA_WORK_ID, mUserId);
return args;
}
final Bundle args = new Bundle(1 + additionalCapacity);
args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB,
mIsWorkProfile ? WORK_TAB : PERSONAL_TAB);
return args;
}
private Intent getFilesIntent() {