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

Merge "Integrating new Avatar Picker App in Settings" into main

Browse Source
This commit is contained in:
Anna Bauza
2024-04-23 12:10:34 +00:00
committed by Gerrit Code Review
parent 52038eb6f2 71361dafd3
commit cb9cd3fa46
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/config.xml
View File

@@ -38,6 +38,11 @@
<!-- Whether to show Camera laser sensor switch in Developer Options --> <!-- Whether to show Camera laser sensor switch in Developer Options -->
<bool name="config_show_camera_laser_sensor">false</bool> <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. --> <!-- 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_package" translatable="false">com.android.settings</string>
<string name="config_wallpaper_picker_class" translatable="false">com.android.settings.Settings$WallpaperSettingsActivity</string> <string name="config_wallpaper_picker_class" translatable="false">com.android.settings.Settings$WallpaperSettingsActivity</string>

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

@@ -34,6 +34,7 @@ import androidx.window.embedding.SplitPairRule;
import androidx.window.embedding.SplitPlaceholderRule; import androidx.window.embedding.SplitPlaceholderRule;
import androidx.window.embedding.SplitRule; import androidx.window.embedding.SplitRule;
import com.android.settings.R;
import com.android.settings.Settings; import com.android.settings.Settings;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings; import com.android.settings.SubSettings;
@@ -261,8 +262,13 @@ public class ActivityEmbeddingRulesController {
addActivityFilter(activityFilters, FaceEnrollIntroduction.class); addActivityFilter(activityFilters, FaceEnrollIntroduction.class);
addActivityFilter(activityFilters, RemoteAuthActivity.class); addActivityFilter(activityFilters, RemoteAuthActivity.class);
addActivityFilter(activityFilters, RemoteAuthActivityInternal.class); addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);
addActivityFilter(activityFilters, AvatarPickerActivity.class);
addActivityFilter(activityFilters, ChooseLockPattern.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) ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)
.build(); .build();
mRuleController.addRule(activityRule); mRuleController.addRule(activityRule);