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

Commit da7f6856 authored by Jiaming Liu's avatar Jiaming Liu Committed by Chris Li
Browse files

Fix build for jetpack update

Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de)
(cherry picked from commit 5a644477)
(cherry picked from commit 1c0af48f)
parent 585a7f3c
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.util.Log;

import androidx.window.embedding.ActivityFilter;
import androidx.window.embedding.ActivityRule;
import androidx.window.embedding.RuleController;
import androidx.window.embedding.SplitAttributes;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitPairFilter;
import androidx.window.embedding.SplitPairRule;
import androidx.window.embedding.SplitPlaceholderRule;
@@ -57,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(context);
        mRuleController = RuleController.getInstance(context);
    }

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

        mSplitController.clearRegisteredRules();
        mRuleController.clearRules();

        // Set a placeholder for home page.
        registerHomepagePlaceholderRule();
@@ -109,7 +109,7 @@ public class ActivityEmbeddingRulesController {
                .setMinSmallestWidthDp(ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthDp())
                .setDefaultSplitAttributes(attributes)
                .build();
        SplitController.getInstance(context).addRule(splitPairRule);
        RuleController.getInstance(context).addRule(splitPairRule);
    }

    /**
@@ -232,7 +232,7 @@ public class ActivityEmbeddingRulesController {
                .setDefaultSplitAttributes(attributes)
                .build();

        mSplitController.addRule(placeholderRule);
        mRuleController.addRule(placeholderRule);
    }

    private void registerAlwaysExpandRule() {
@@ -249,7 +249,7 @@ public class ActivityEmbeddingRulesController {
        addActivityFilter(activityFilters, AvatarPickerActivity.class);
        ActivityRule activityRule = new ActivityRule.Builder(activityFilters).setAlwaysExpand(true)
                .build();
        mSplitController.addRule(activityRule);
        mRuleController.addRule(activityRule);
    }

    private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {
+5 −5
Original line number Diff line number Diff line
@@ -56,7 +56,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;
@@ -102,7 +102,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.
@@ -190,8 +190,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements
        setupEdgeToEdge();
        setContentView(R.layout.settings_homepage_container);

        mSplitController = SplitController.getInstance(this);
        mIsTwoPane = mSplitController.isActivityEmbedded(this);
        mActivityEmbeddingController = ActivityEmbeddingController.getInstance(this);
        mIsTwoPane = mActivityEmbeddingController.isActivityEmbedded(this);

        updateAppBarMinHeight();
        initHomepageContainer();
@@ -266,7 +266,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();
+6 −6
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;
@@ -65,7 +65,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
    private int mPaddingHorizontal;
    private boolean mScrollNeeded = true;
    private boolean mFirstStarted = true;
    private SplitController mSplitController;
    private ActivityEmbeddingController mActivityEmbeddingController;

    public TopLevelSettings() {
        final Bundle args = new Bundle();
@@ -155,12 +155,12 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
        }
    }

    /** Wrap SplitController#isActivityEmbedded for testing. */
    /** Wrap ActivityEmbeddingController#isActivityEmbedded for testing. */
    public boolean isActivityEmbedded() {
        if (mSplitController == null) {
            mSplitController = SplitController.getInstance(getActivity());
        if (mActivityEmbeddingController == null) {
            mActivityEmbeddingController = ActivityEmbeddingController.getInstance(getActivity());
        }
        return mSplitController.isActivityEmbedded(getActivity());
        return mActivityEmbeddingController.isActivityEmbedded(getActivity());
    }

    @Override
+3 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceGroupAdapter;
import androidx.preference.PreferenceViewHolder;
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;
@@ -250,6 +250,7 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
    }

    private boolean isHighlightNeeded() {
        return SplitController.getInstance(mHomepageActivity).isActivityEmbedded(mHomepageActivity);
        return ActivityEmbeddingController.getInstance(mHomepageActivity)
                .isActivityEmbedded(mHomepageActivity);
    }
}