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

Refactor SettingsLib to remove redundant resources conditionally

Browse Source 
Bug: 320878675
Test: manual
Change-Id: I21b7cf56c74be759ac95621498b753ac70d143b2
This commit is contained in:
Anna Bauza
2024-03-26 19:26:55 +00:00
parent ea6500455a
commit 6346ae2aab
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.remoteauth.RemoteAuthActivity;
import com.android.settings.remoteauth.RemoteAuthActivityInternal;
import com.android.settingslib.users.AvatarPickerActivity;
import java.util.Collection;
import java.util.HashSet;
@@ -265,12 +264,9 @@ public class ActivityEmbeddingRulesController {
addActivityFilter(activityFilters, RemoteAuthActivity.class);
addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);
addActivityFilter(activityFilters, ChooseLockPattern.class);
if (android.multiuser.Flags.avatarSync()) {
String action = mContext.getString(R.string.config_avatar_picker_action);
addActivityFilter(activityFilters, new Intent(action));
} else {
addActivityFilter(activityFilters, AvatarPickerActivity.class);
}
String action = mContext.getString(R.string.config_avatar_picker_action);
addActivityFilter(activityFilters, new Intent(action));
ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)
.build();
mRuleController.addRule(activityRule);