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

Commit a58256be authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Automerger Merge Worker
Browse files

Fix abnormal behavior on avatar account page am: 17423d16 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16327062

Change-Id: I2f6e3fe33969760c7639122df34901856dde27fb
parents 95405970 17423d16

src/com/android/settings/accounts/AvatarViewMixin.java

+12 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.lifecycle.MutableLiveData; 
import androidx.lifecycle.OnLifecycleEvent;



import com.android.settings.R;

import com.android.settings.activityembedding.ActivityEmbeddingRulesController;

import com.android.settings.homepage.SettingsHomepageActivity;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.utils.ThreadUtils;
@@ -105,6 +106,17 @@ public class AvatarViewMixin implements LifecycleObserver { 
                return;

            }



            // Set a component name since activity embedding requires a component name for

            // registering a rule.

            intent.setComponent(matchedIntents.get(0).getComponentInfo().getComponentName());

            ActivityEmbeddingRulesController.registerTwoPanePairRuleForSettingsHome(

                    mContext,

                    intent.getComponent(),

                    intent.getAction(),

                    false /* finishPrimaryWithSecondary */,

                    true /* finishSecondaryWithPrimary */,

                    false /* clearTop */);



            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()

                    .logSettingsTileClick(KEY_AVATAR_ICON, SettingsEnums.SETTINGS_HOMEPAGE);