Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d64b983 authored by Anna Bauza's avatar Anna Bauza Committed by Android (Google) Code Review
Browse files

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

parents 5e8a4ab4 e6c9a08a

res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java

+7 −1
Original line number Diff line number Diff line
@@ -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);