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

Commit a54ecedd authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Gerrit Code Review
Browse files

Merge changes from topic "androidx_ae" 

* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.
parents 5fd26540 b9f82bed

src/com/android/settings/SettingsInitialize.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class SettingsInitialize extends BroadcastReceiver { 
                DeepLinkHomepageActivity.class);

        final ComponentName searchStateReceiver = new ComponentName(context,

                SearchStateReceiver.class);

        final int enableState = SplitController.getInstance().isSplitSupported()

        final int enableState = SplitController.getInstance(context).isSplitSupported()

                ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;

        pm.setComponentEnabledSetting(deepLinkHome, enableState, PackageManager.DONT_KILL_APP);

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

+56 −36
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.util.FeatureFlagUtils;

import android.util.LayoutDirection;

import android.util.Log;



import androidx.window.embedding.ActivityFilter;

import androidx.window.embedding.ActivityRule;

import androidx.window.embedding.SplitController;

import androidx.window.embedding.RuleController;

import androidx.window.embedding.SplitAttributes;

import androidx.window.embedding.SplitPairFilter;

import androidx.window.embedding.SplitPairRule;

import androidx.window.embedding.SplitPlaceholderRule;
@@ -46,6 +46,7 @@ import com.android.settings.homepage.SettingsHomepageActivity; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.users.AvatarPickerActivity;



import java.util.Collection;

import java.util.HashSet;

import java.util.Set;
@@ -56,11 +57,11 @@ public class ActivityEmbeddingRulesController { 
    private static final ComponentName COMPONENT_NAME_WILDCARD = new ComponentName(

            "*" /* pkg */, "*" /* cls */);

    private final Context mContext;

    private final SplitController mSplitController;

    private final RuleController mRuleController;



    public ActivityEmbeddingRulesController(Context context) {

        mContext = context;

        mSplitController = SplitController.getInstance();

        mRuleController = RuleController.getInstance(context);

    }



    /**
@@ -72,7 +73,7 @@ public class ActivityEmbeddingRulesController { 
            return;

        }



        mSplitController.clearRegisteredRules();

        mRuleController.clearRules();



        // Set a placeholder for home page.

        registerHomepagePlaceholderRule();
@@ -85,8 +86,8 @@ public class ActivityEmbeddingRulesController { 
            ComponentName primaryComponent,

            ComponentName secondaryComponent,

            String secondaryIntentAction,

            int finishPrimaryWithSecondary,

            int finishSecondaryWithPrimary,

            SplitRule.FinishBehavior finishPrimaryWithSecondary,

            SplitRule.FinishBehavior finishSecondaryWithPrimary,

            boolean clearTop) {

        if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {

            return;
@@ -95,14 +96,20 @@ public class ActivityEmbeddingRulesController { 
        filters.add(new SplitPairFilter(primaryComponent, secondaryComponent,

                secondaryIntentAction));



        SplitController.getInstance().registerRule(new SplitPairRule(filters,

                finishPrimaryWithSecondary,

                finishSecondaryWithPrimary,

                clearTop,

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),

                ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(context),

                ActivityEmbeddingUtils.getSplitRatio(context),

                LayoutDirection.LOCALE));

        SplitAttributes attributes = new SplitAttributes.Builder()

                .setSplitType(SplitAttributes.SplitType.ratio(

                        ActivityEmbeddingUtils.getSplitRatio(context)))

                .setLayoutDirection(SplitAttributes.LayoutDirection.LOCALE)

                .build();

        SplitPairRule splitPairRule = new SplitPairRule.Builder(filters)

                .setFinishPrimaryWithSecondary(finishPrimaryWithSecondary)

                .setFinishSecondaryWithPrimary(finishSecondaryWithPrimary)

                .setClearTop(clearTop)

                .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())

                .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())

                .setDefaultSplitAttributes(attributes)

                .build();

        RuleController.getInstance(context).addRule(splitPairRule);

    }



    /**
@@ -123,8 +130,10 @@ public class ActivityEmbeddingRulesController { 
                new ComponentName(context, Settings.class),

                secondaryComponent,

                secondaryIntentAction,

                finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ADJACENT

                        : SplitRule.FinishBehavior.NEVER,

                finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ADJACENT

                        : SplitRule.FinishBehavior.NEVER,

                clearTop);



        registerTwoPanePairRule(
@@ -132,8 +141,10 @@ public class ActivityEmbeddingRulesController { 
                new ComponentName(context, SettingsHomepageActivity.class),

                secondaryComponent,

                secondaryIntentAction,

                finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,

                finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ADJACENT

                        : SplitRule.FinishBehavior.NEVER,

                finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ADJACENT

                        : SplitRule.FinishBehavior.NEVER,

                clearTop);



        // We should finish HomePageActivity altogether even if it shows in single pane for all deep
@@ -143,8 +154,10 @@ public class ActivityEmbeddingRulesController { 
                new ComponentName(context, DeepLinkHomepageActivity.class),

                secondaryComponent,

                secondaryIntentAction,

                finishPrimaryWithSecondary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,

                finishSecondaryWithPrimary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,

                finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ALWAYS

                        : SplitRule.FinishBehavior.NEVER,

                finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ALWAYS

                        : SplitRule.FinishBehavior.NEVER,

                clearTop);



        registerTwoPanePairRule(
@@ -152,8 +165,10 @@ public class ActivityEmbeddingRulesController { 
                new ComponentName(context, DeepLinkHomepageActivityInternal.class),

                secondaryComponent,

                secondaryIntentAction,

                finishPrimaryWithSecondary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,

                finishSecondaryWithPrimary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,

                finishPrimaryWithSecondary ? SplitRule.FinishBehavior.ALWAYS

                        : SplitRule.FinishBehavior.NEVER,

                finishSecondaryWithPrimary ? SplitRule.FinishBehavior.ALWAYS

                        : SplitRule.FinishBehavior.NEVER,

                clearTop);

    }
@@ -204,17 +219,20 @@ public class ActivityEmbeddingRulesController { 


        final Intent intent = new Intent(mContext, Settings.NetworkDashboardActivity.class);

        intent.putExtra(SettingsActivity.EXTRA_IS_SECOND_LAYER_PAGE, true);

        final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(

                activityFilters,

                intent,

                true /* stickyPlaceholder */,

                SplitRule.FINISH_ADJACENT,

                ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext),

                ActivityEmbeddingUtils.getSplitRatio(mContext),

                LayoutDirection.LOCALE);

        SplitAttributes attributes = new SplitAttributes.Builder()

                .setSplitType(SplitAttributes.SplitType.ratio(

                        ActivityEmbeddingUtils.getSplitRatio(mContext)))

                .build();

        final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule.Builder(

                activityFilters, intent)

                .setMinWidthDp(ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthDp())

                .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())

                .setSticky(true)

                .setFinishPrimaryWithPlaceholder(SplitRule.FinishBehavior.ADJACENT)

                .setDefaultSplitAttributes(attributes)

                .build();



        mSplitController.registerRule(placeholderRule);

        mRuleController.addRule(placeholderRule);

    }



    private void registerAlwaysExpandRule() {
@@ -229,14 +247,16 @@ public class ActivityEmbeddingRulesController { 
        addActivityFilter(activityFilters, FingerprintEnrollIntroductionInternal.class);

        addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);

        addActivityFilter(activityFilters, AvatarPickerActivity.class);

        mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */));

        ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)

                .build();

        mRuleController.addRule(activityRule);

    }



    private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {

        activityFilters.add(new ActivityFilter(COMPONENT_NAME_WILDCARD, intent.getAction()));

    }



    private void addActivityFilter(Set<ActivityFilter> activityFilters,

    private void addActivityFilter(Collection<ActivityFilter> activityFilters,

            Class<? extends Activity> activityClass) {

        activityFilters.add(new ActivityFilter(new ComponentName(mContext, activityClass),

                null /* intentAction */));

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

+9 −13
Original line number Diff line number Diff line
@@ -30,29 +30,25 @@ import com.android.settings.R; 
/** An util class collecting all common methods for the embedding activity features. */

public class ActivityEmbeddingUtils {

    // The smallest value of current width of the window when the split should be used.

    private static final float MIN_CURRENT_SCREEN_SPLIT_WIDTH_DP = 720f;

    private static final int MIN_CURRENT_SCREEN_SPLIT_WIDTH_DP = 720;

    // The smallest value of the smallest-width (sw) of the window in any rotation when

    // the split should be used.

    private static final float MIN_SMALLEST_SCREEN_SPLIT_WIDTH_DP = 600f;

    private static final int MIN_SMALLEST_SCREEN_SPLIT_WIDTH_DP = 600;

    // The minimum width of the activity to show the regular homepage layout.

    private static final float MIN_REGULAR_HOMEPAGE_LAYOUT_WIDTH_DP = 380f;

    private static final String TAG = "ActivityEmbeddingUtils";



    /** Get the smallest pixel value of width of the window when the split should be used. */

    public static int getMinCurrentScreenSplitWidthPx(Context context) {

        final DisplayMetrics dm = context.getResources().getDisplayMetrics();

        return (int) TypedValue.applyDimension(

                TypedValue.COMPLEX_UNIT_DIP, MIN_CURRENT_SCREEN_SPLIT_WIDTH_DP, dm);

    /** Get the smallest width dp of the window when the split should be used. */

    public static int getMinCurrentScreenSplitWidthDp() {

        return MIN_CURRENT_SCREEN_SPLIT_WIDTH_DP;

    }



    /**

     * Get the smallest pixel value of the smallest-width (sw) of the window in any rotation when

     * Get the smallest dp value of the smallest-width (sw) of the window in any rotation when

     * the split should be used.

     */

    public static int getMinSmallestScreenSplitWidthPx(Context context) {

        final DisplayMetrics dm = context.getResources().getDisplayMetrics();

        return (int) TypedValue.applyDimension(

                TypedValue.COMPLEX_UNIT_DIP, MIN_SMALLEST_SCREEN_SPLIT_WIDTH_DP, dm);

    public static int getMinSmallestScreenSplitWidthDp() {

        return MIN_SMALLEST_SCREEN_SPLIT_WIDTH_DP;

    }



    /**
@@ -67,7 +63,7 @@ public class ActivityEmbeddingUtils { 
    public static boolean isEmbeddingActivityEnabled(Context context) {

        final boolean isFlagEnabled = FeatureFlagUtils.isEnabled(context,

                FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN);

        final boolean isSplitSupported = SplitController.getInstance().isSplitSupported();

        final boolean isSplitSupported = SplitController.getInstance(context).isSplitSupported();



        Log.d(TAG, "isFlagEnabled = " + isFlagEnabled);

        Log.d(TAG, "isSplitSupported = " + isSplitSupported);

src/com/android/settings/homepage/SettingsHomepageActivity.java

+9 −9
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import androidx.fragment.app.Fragment; 
import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;

import androidx.window.embedding.SplitController;

import androidx.window.embedding.ActivityEmbeddingController;

import androidx.window.embedding.SplitRule;



import com.android.settings.R;
@@ -95,7 +95,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
    private View mTwoPaneSuggestionView;

    private CategoryMixin mCategoryMixin;

    private Set<HomepageLoadedListener> mLoadedListeners;

    private SplitController mSplitController;

    private ActivityEmbeddingController mActivityEmbeddingController;

    private boolean mIsEmbeddingActivityEnabled;

    private boolean mIsTwoPane;

    // A regular layout shows icons on homepage, whereas a simplified layout doesn't.
@@ -183,8 +183,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
        setupEdgeToEdge();

        setContentView(R.layout.settings_homepage_container);



        mSplitController = SplitController.getInstance();

        mIsTwoPane = mSplitController.isActivityEmbedded(this);

        mActivityEmbeddingController = ActivityEmbeddingController.getInstance(this);

        mIsTwoPane = mActivityEmbeddingController.isActivityEmbedded(this);



        updateAppBarMinHeight();

        initHomepageContainer();
@@ -248,7 +248,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
    @Override

    public void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        final boolean newTwoPaneState = mSplitController.isActivityEmbedded(this);

        final boolean newTwoPaneState = mActivityEmbeddingController.isActivityEmbedded(this);

        if (mIsTwoPane != newTwoPaneState) {

            mIsTwoPane = newTwoPaneState;

            updateHomepageAppBar();
@@ -453,15 +453,15 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
                new ComponentName(getApplicationContext(), getClass()),

                targetComponentName,

                targetIntent.getAction(),

                SplitRule.FINISH_ALWAYS,

                SplitRule.FINISH_ALWAYS,

                SplitRule.FinishBehavior.ALWAYS,

                SplitRule.FinishBehavior.ALWAYS,

                true /* clearTop */);

        ActivityEmbeddingRulesController.registerTwoPanePairRule(this,

                new ComponentName(getApplicationContext(), Settings.class),

                targetComponentName,

                targetIntent.getAction(),

                SplitRule.FINISH_ALWAYS,

                SplitRule.FINISH_ALWAYS,

                SplitRule.FinishBehavior.ALWAYS,

                SplitRule.FinishBehavior.ALWAYS,

                true /* clearTop */);



        final UserHandle user = intent.getParcelableExtra(EXTRA_USER_HANDLE, UserHandle.class);

src/com/android/settings/homepage/TopLevelSettings.java

+13 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceScreen;

import androidx.recyclerview.widget.RecyclerView;

import androidx.window.embedding.SplitController;

import androidx.window.embedding.ActivityEmbeddingController;



import com.android.settings.R;

import com.android.settings.Utils;
@@ -64,6 +64,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi 
    private int mPaddingHorizontal;

    private boolean mScrollNeeded = true;

    private boolean mFirstStarted = true;

    private ActivityEmbeddingController mActivityEmbeddingController;



    public TopLevelSettings() {

        final Bundle args = new Bundle();
@@ -142,7 +143,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi 
            return;

        }



        boolean activityEmbedded = SplitController.getInstance().isActivityEmbedded(getActivity());

        boolean activityEmbedded = isActivityEmbedded();

        if (icicle != null) {

            mHighlightMixin = icicle.getParcelable(SAVED_HIGHLIGHT_MIXIN);

            mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded;
@@ -153,12 +154,20 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi 
        }

    }



    /** Wrap ActivityEmbeddingController#isActivityEmbedded for testing. */

    public boolean isActivityEmbedded() {

        if (mActivityEmbeddingController == null) {

            mActivityEmbeddingController = ActivityEmbeddingController.getInstance(getActivity());

        }

        return mActivityEmbeddingController.isActivityEmbedded(getActivity());

    }



    @Override

    public void onStart() {

        if (mFirstStarted) {

            mFirstStarted = false;

        } else if (mIsEmbeddingActivityEnabled && isOnlyOneActivityInTask()

                && !SplitController.getInstance().isActivityEmbedded(getActivity())) {

                && !isActivityEmbedded()) {

            // Set default highlight menu key for 1-pane homepage since it will show the placeholder

            // page once changing back to 2-pane.

            Log.i(TAG, "Set default menu key");
@@ -283,7 +292,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi 
         * 3. the current activity is embedded */

        return mHighlightMixin != null

                && TextUtils.equals(pref.getKey(), mHighlightMixin.getHighlightPreferenceKey())

                && SplitController.getInstance().isActivityEmbedded(getActivity());

                && isActivityEmbedded();

    }



    /** Show/hide the highlight on the menu entry for the search page presence */