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

Commit 85986bf9 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Split activity organizer in WM Extensions 

Reference implementation for the client-side organizer
for side-by-side split activity UI.

Bug: 190433398
Bug: 190432728
Bug: 190433500
Bug: 190433972
Bug: 191163577
Bug: 191163638
Test: Manual, using the sample in WM Jetpack
Change-Id: I27335d47f4f544e2b9f63c5daaac9bd1c272a89f
parent 7ae2cae6

core/java/android/app/ActivityThread.java

+7 −7
Original line number Diff line number Diff line
@@ -3552,6 +3552,13 @@ public final class ActivityThread extends ClientTransactionHandler 
                    + ", comp=" + r.intent.getComponent().toShortString()

                    + ", dir=" + r.packageInfo.getAppDir());



            // updatePendingActivityConfiguration() reads from mActivities to update

            // ActivityClientRecord which runs in a different thread. Protect modifications to

            // mActivities to avoid race.

            synchronized (mResourcesManager) {

                mActivities.put(r.token, r);

            }



            if (activity != null) {

                CharSequence title = r.activityInfo.loadLabel(appContext.getPackageManager());

                Configuration config =
@@ -3613,13 +3620,6 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

            r.setState(ON_CREATE);



            // updatePendingActivityConfiguration() reads from mActivities to update

            // ActivityClientRecord which runs in a different thread. Protect modifications to

            // mActivities to avoid race.

            synchronized (mResourcesManager) {

                mActivities.put(r.token, r);

            }



        } catch (SuperNotCalledException e) {

            throw e;

libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java

+32 −0
Original line number Diff line number Diff line
@@ -23,15 +23,19 @@ import static androidx.window.util.ExtensionHelper.transformToWindowSpaceRect; 


import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.graphics.Rect;

import android.os.Bundle;

import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.window.common.DeviceStateManagerPostureProducer;

import androidx.window.common.DisplayFeature;

import androidx.window.common.ResourceConfigDisplayFeatureProducer;

import androidx.window.common.SettingsDevicePostureProducer;

import androidx.window.common.SettingsDisplayFeatureProducer;

import androidx.window.extensions.organizer.SplitController;

import androidx.window.util.DataProducer;

import androidx.window.util.PriorityDataProducer;
@@ -56,6 +60,8 @@ class SampleExtensionImpl extends StubExtension { 
    private final SettingsDisplayFeatureProducer mSettingsDisplayFeatureProducer;

    private final DataProducer<List<DisplayFeature>> mDisplayFeatureProducer;



    private final SplitController mSplitController;



    SampleExtensionImpl(Context context) {

        mSettingsDevicePostureProducer = new SettingsDevicePostureProducer(context);

        mDevicePostureProducer = new PriorityDataProducer<>(List.of(
@@ -71,6 +77,8 @@ class SampleExtensionImpl extends StubExtension { 


        mDevicePostureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged);

        mDisplayFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged);



        mSplitController = new SplitController();

    }



    private int getFeatureState(DisplayFeature feature) {
@@ -134,4 +142,28 @@ class SampleExtensionImpl extends StubExtension { 


        onDisplayFeaturesChanged();

    }



    @Override

    public void setSplitRules(@NonNull List<ExtensionSplitRule> splitRules) {

        mSplitController.setSplitRules(splitRules);

    }



    @Override

    @NonNull

    public List<ExtensionSplitRule> getSplitRules() {

        return new ArrayList<>(mSplitController.getSplitRules());

    }



    @Override

    public void setSplitOrganizerCallback(@Nullable SplitOrganizerCallback callback) {

        mSplitController.setSplitOrganizerCallback(callback);

    }



    @Override

    public void startActivityToSide(@NonNull Activity launchingActivity, @NonNull Intent intent,

            @Nullable Bundle options, @NonNull ExtensionSplitPairRule splitPairRule,

            int startRequestId) {

        mSplitController.startActivityToSide(launchingActivity, intent, options, splitPairRule,

                startRequestId);

    }

}