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

Merge "Refactor SettingsLib to remove redundant resources conditionally" into main

Browse Source
This commit is contained in:
Anna Bauza
2024-03-29 21:08:49 +00:00
committed by Android (Google) Code Review
parent 6565292c71 6346ae2aab
commit 1a621c4910
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
View File

@@ -52,7 +52,6 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockPattern; import com.android.settings.password.ChooseLockPattern;
import com.android.settings.remoteauth.RemoteAuthActivity; import com.android.settings.remoteauth.RemoteAuthActivity;
import com.android.settings.remoteauth.RemoteAuthActivityInternal; import com.android.settings.remoteauth.RemoteAuthActivityInternal;
import com.android.settingslib.users.AvatarPickerActivity;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
@@ -265,12 +264,9 @@ public class ActivityEmbeddingRulesController {
addActivityFilter(activityFilters, RemoteAuthActivity.class); addActivityFilter(activityFilters, RemoteAuthActivity.class);
addActivityFilter(activityFilters, RemoteAuthActivityInternal.class); addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);
addActivityFilter(activityFilters, ChooseLockPattern.class); addActivityFilter(activityFilters, ChooseLockPattern.class);
if (android.multiuser.Flags.avatarSync()) { String action = mContext.getString(R.string.config_avatar_picker_action);
String action = mContext.getString(R.string.config_avatar_picker_action); addActivityFilter(activityFilters, new Intent(action));
addActivityFilter(activityFilters, new Intent(action));
} else {
addActivityFilter(activityFilters, AvatarPickerActivity.class);
}
ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true) ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)
.build(); .build();
mRuleController.addRule(activityRule); mRuleController.addRule(activityRule);