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

Commit 71361daf authored by Anna Bauza's avatar Anna Bauza Committed by Android Build Cherrypicker Worker
Browse files

Integrating new Avatar Picker App in Settings 

Bug: 309426522
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e6c9a08ab7648d884c0d9c3fbbc7f8c74a016624)
Merged-In: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
Change-Id: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
parent 52038eb6

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);