diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-23 23:28:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-23 23:28:57 +0000 |
| commit | 2975e025027c3d9aca8d3dabea4b02bc40a3dafa (patch) | |
| tree | 3c65841b05b97a907044afb3cb7e2e4cb3b4db2e | |
| parent | a1adf9242efdf5285c780c4661ebd6c85a0db3d4 (diff) | |
| parent | a3d0e0341aff95696fe33b460ef7b143ca0e3fe7 (diff) | |
| download | Settings-sdk-release.tar.gz | |
Merge "Snap for 11754915 from 1c7a9269a1701b1101a976731443c91e37e2b385 to sdk-release" into sdk-releasesdk-release
| -rw-r--r-- | res/values/config.xml | 5 | ||||
| -rw-r--r-- | src/com/android/settings/accessibility/OWNERS | 7 | ||||
| -rw-r--r-- | src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java | 8 |
3 files changed, 19 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/accessibility/OWNERS b/src/com/android/settings/accessibility/OWNERS index 3bd156bdd9f..633e9c74aec 100644 --- a/src/com/android/settings/accessibility/OWNERS +++ b/src/com/android/settings/accessibility/OWNERS @@ -1,3 +1,6 @@ +# The Android Accessibility team should approve all changes to Settings > Accessibility content. +set noparent + # Default reviewers for this and subdirectories. chunkulin@google.com danielnorman@google.com @@ -8,5 +11,9 @@ thomasli@google.com # Legacy owner(s). menghanli@google.com #{LAST_RESORT_SUGGESTION} +# Core Settings owner for emergency changes. +cipson@google.com #{LAST_RESORT_SUGGESTION} + +# Partner-team files per-file HapticFeedbackIntensityPreferenceController.java = michaelwr@google.com per-file *Vibration* = michaelwr@google.com 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); |