diff options
| author | Anna Bauza <annabauza@google.com> | 2024-04-23 12:10:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-23 12:10:34 +0000 |
| commit | cb9cd3fa46c62dca96b4053a91a9748755b8ed89 (patch) | |
| tree | 40a880153b8b1e0692ff08ad21b4f1ee334edf4d | |
| parent | 52038eb6f2d75af9c3e4117b18f570479f53cf69 (diff) | |
| parent | 71361dafd3af1a24cc2a1ac5f045c94c09b692dc (diff) | |
| download | Settings-cb9cd3fa46c62dca96b4053a91a9748755b8ed89.tar.gz | |
Merge "Integrating new Avatar Picker App in Settings" into main
| -rw-r--r-- | res/values/config.xml | 5 | ||||
| -rw-r--r-- | src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index d084ff9e2ba..d0cd96b8e1b 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -38,6 +38,11 @@ <!-- Whether to show Camera laser sensor switch in Developer Options --> <bool name="config_show_camera_laser_sensor">false</bool> + <!-- Intent action to open Avatar Picker app --> + <string name="config_avatar_picker_action" translatable="false"> + com.android.avatarpicker.FULL_SCREEN_ACTIVITY + </string> + <!-- Package name and fully-qualified class name for the wallpaper picker activity. --> <string name="config_wallpaper_picker_package" translatable="false">com.android.settings</string> <string name="config_wallpaper_picker_class" translatable="false">com.android.settings.Settings$WallpaperSettingsActivity</string> diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index 3b79b47d8db..50134ba7eb6 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -34,6 +34,7 @@ import androidx.window.embedding.SplitPairRule; import androidx.window.embedding.SplitPlaceholderRule; import androidx.window.embedding.SplitRule; +import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; @@ -261,8 +262,13 @@ public class ActivityEmbeddingRulesController { addActivityFilter(activityFilters, FaceEnrollIntroduction.class); addActivityFilter(activityFilters, RemoteAuthActivity.class); addActivityFilter(activityFilters, RemoteAuthActivityInternal.class); - addActivityFilter(activityFilters, AvatarPickerActivity.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); + } ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true) .build(); mRuleController.addRule(activityRule); |