Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Merge state producer and feature producer.

Browse Source 
Merge device state producer and display feature producer so that
FoldingFeature data has a single data pipeline. This should make it
easier to retrigger reading data if other signals are necessary.

Bug: 205342008
Test: manual - run sample app.
Change-Id: I7b66a45be8fcbb1a66d9aa8eab235d83877526ea
This commit is contained in:
Diego Vela
2021-12-01 21:23:08 -08:00
parent 882901805b
commit e5c6ad5d79
7 changed files with 120 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libs/WindowManager/Jetpack/src/androidx/window/common/CommonFoldingFeature.java
View File

@@ -21,11 +21,14 @@ import static androidx.window.util.ExtensionHelper.isZero;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -37,6 +40,10 @@ import java.util.regex.Pattern;
*/ */
public final class CommonFoldingFeature { public final class CommonFoldingFeature {
private static final boolean DEBUG = false;
public static final String TAG = CommonFoldingFeature.class.getSimpleName();
/** /**
* A common type to represent a hinge where the screen is continuous. * A common type to represent a hinge where the screen is continuous.
*/ */
@@ -53,6 +60,12 @@ public final class CommonFoldingFeature {
public @interface Type { public @interface Type {
} }
/**
* A common state to represent when the state is not known. One example is if the device is
* closed. We do not emit this value for developers but is useful for implementation reasons.
*/
public static final int COMMON_STATE_UNKNOWN = -1;
/** /**
* A common state to represent a FLAT hinge. This is needed because the definitions in Sidecar * A common state to represent a FLAT hinge. This is needed because the definitions in Sidecar
* and Extensions do not match exactly. * and Extensions do not match exactly.
@@ -81,15 +94,49 @@ public final class CommonFoldingFeature {
private static final String PATTERN_STATE_FLAT = "flat"; private static final String PATTERN_STATE_FLAT = "flat";
private static final String PATTERN_STATE_HALF_OPENED = "half-opened"; private static final String PATTERN_STATE_HALF_OPENED = "half-opened";
/**
* Parse a {@link List} of {@link CommonFoldingFeature} from a {@link String}.
* @param value a {@link String} representation of multiple {@link CommonFoldingFeature}
* separated by a ":".
* @param hingeState a global fallback value for a {@link CommonFoldingFeature} if one is not
* specified in the input.
* @throws IllegalArgumentException if the provided string is improperly formatted or could not
* otherwise be parsed.
* @see #FEATURE_PATTERN
* @return {@link List} of {@link CommonFoldingFeature}.
*/
static List<CommonFoldingFeature> parseListFromString(@NonNull String value,
@State int hingeState) {
List<CommonFoldingFeature> features = new ArrayList<>();
String[] featureStrings = value.split(";");
for (String featureString : featureStrings) {
CommonFoldingFeature feature;
try {
feature = CommonFoldingFeature.parseFromString(featureString, hingeState);
} catch (IllegalArgumentException e) {
if (DEBUG) {
Log.w(TAG, "Failed to parse display feature: " + featureString, e);
}
continue;
}
features.add(feature);
}
return features;
}
/** /**
* Parses a display feature from a string. * Parses a display feature from a string.
* *
* @param string A {@link String} representation of a {@link CommonFoldingFeature}.
* @param hingeState A fallback value for the {@link State} if it is not specified in the input.
* @throws IllegalArgumentException if the provided string is improperly formatted or could not * @throws IllegalArgumentException if the provided string is improperly formatted or could not
* otherwise be parsed. * otherwise be parsed.
* @return {@link CommonFoldingFeature} represented by the {@link String} value.
* @see #FEATURE_PATTERN * @see #FEATURE_PATTERN
*/ */
@NonNull @NonNull
static CommonFoldingFeature parseFromString(@NonNull String string) { private static CommonFoldingFeature parseFromString(@NonNull String string,
@State int hingeState) {
Matcher featureMatcher = FEATURE_PATTERN.matcher(string); Matcher featureMatcher = FEATURE_PATTERN.matcher(string);
if (!featureMatcher.matches()) { if (!featureMatcher.matches()) {
throw new IllegalArgumentException("Malformed feature description format: " + string); throw new IllegalArgumentException("Malformed feature description format: " + string);
@@ -120,7 +167,7 @@ public final class CommonFoldingFeature {
} }
String stateString = featureMatcher.group(6); String stateString = featureMatcher.group(6);
stateString = stateString == null ? "" : stateString; stateString = stateString == null ? "" : stateString;
Integer state; final int state;
switch (stateString) { switch (stateString) {
case PATTERN_STATE_FLAT: case PATTERN_STATE_FLAT:
state = COMMON_STATE_FLAT; state = COMMON_STATE_FLAT;
@@ -129,7 +176,7 @@ public final class CommonFoldingFeature {
state = COMMON_STATE_HALF_OPENED; state = COMMON_STATE_HALF_OPENED;
break; break;
default: default:
state = null; state = hingeState;
break; break;
} }
return new CommonFoldingFeature(type, state, featureRect); return new CommonFoldingFeature(type, state, featureRect);
@@ -140,11 +187,11 @@ public final class CommonFoldingFeature {
private final int mType; private final int mType;
@Nullable @Nullable
private final Integer mState; private final int mState;
@NonNull @NonNull
private final Rect mRect; private final Rect mRect;
CommonFoldingFeature(int type, @Nullable Integer state, @NonNull Rect rect) { CommonFoldingFeature(int type, int state, @NonNull Rect rect) {
assertValidState(state); assertValidState(state);
this.mType = type; this.mType = type;
this.mState = state; this.mState = state;
@@ -162,9 +209,8 @@ public final class CommonFoldingFeature {
} }
/** Returns the state of the feature, or {@code null} if the feature has no state. */ /** Returns the state of the feature, or {@code null} if the feature has no state. */
@Nullable
@State @State
public Integer getState() { public int getState() {
return mState; return mState;
} }

30
libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerPostureProducer.java → libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java
View File

@@ -18,11 +18,15 @@ package androidx.window.common;
import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE;
import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_UNKNOWN;
import static androidx.window.common.CommonFoldingFeature.parseListFromString;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.hardware.devicestate.DeviceStateManager; import android.hardware.devicestate.DeviceStateManager;
import android.hardware.devicestate.DeviceStateManager.DeviceStateCallback; import android.hardware.devicestate.DeviceStateManager.DeviceStateCallback;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.SparseIntArray; import android.util.SparseIntArray;
@@ -30,6 +34,7 @@ import androidx.window.util.BaseDataProducer;
import com.android.internal.R; import com.android.internal.R;
import java.util.List;
import java.util.Optional; import java.util.Optional;
/** /**
@@ -37,10 +42,13 @@ import java.util.Optional;
* by mapping the state returned from {@link DeviceStateManager} to values provided in the resources * by mapping the state returned from {@link DeviceStateManager} to values provided in the resources
* config at {@link R.array#config_device_state_postures}. * config at {@link R.array#config_device_state_postures}.
*/ */
public final class DeviceStateManagerPostureProducer extends BaseDataProducer<Integer> { public final class DeviceStateManagerFoldingFeatureProducer extends
private static final String TAG = "ConfigDevicePostureProducer"; BaseDataProducer<List<CommonFoldingFeature>> {
private static final String TAG =
DeviceStateManagerFoldingFeatureProducer.class.getSimpleName();
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private final Context mContext;
private final SparseIntArray mDeviceStateToPostureMap = new SparseIntArray(); private final SparseIntArray mDeviceStateToPostureMap = new SparseIntArray();
private int mCurrentDeviceState = INVALID_DEVICE_STATE; private int mCurrentDeviceState = INVALID_DEVICE_STATE;
@@ -50,7 +58,8 @@ public final class DeviceStateManagerPostureProducer extends BaseDataProducer<In
notifyDataChanged(); notifyDataChanged();
}; };
public DeviceStateManagerPostureProducer(@NonNull Context context) { public DeviceStateManagerFoldingFeatureProducer(@NonNull Context context) {
mContext = context;
String[] deviceStatePosturePairs = context.getResources() String[] deviceStatePosturePairs = context.getResources()
.getStringArray(R.array.config_device_state_postures); .getStringArray(R.array.config_device_state_postures);
for (String deviceStatePosturePair : deviceStatePosturePairs) { for (String deviceStatePosturePair : deviceStatePosturePairs) {
@@ -86,8 +95,17 @@ public final class DeviceStateManagerPostureProducer extends BaseDataProducer<In
@Override @Override
@Nullable @Nullable
public Optional<Integer> getData() { public Optional<List<CommonFoldingFeature>> getData() {
final int posture = mDeviceStateToPostureMap.get(mCurrentDeviceState, -1); final int globalHingeState = globalHingeState();
return posture != -1 ? Optional.of(posture) : Optional.empty(); String displayFeaturesString = mContext.getResources().getString(
R.string.config_display_features);
if (TextUtils.isEmpty(displayFeaturesString)) {
return Optional.empty();
}
return Optional.of(parseListFromString(displayFeaturesString, globalHingeState));
}
private int globalHingeState() {
return mDeviceStateToPostureMap.get(mCurrentDeviceState, COMMON_STATE_UNKNOWN);
} }
} }

74
libs/WindowManager/Jetpack/src/androidx/window/common/ResourceConfigDisplayFeatureProducer.java
View File

@@ -1,74 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package androidx.window.common;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import androidx.window.util.BaseDataProducer;
import com.android.internal.R;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
/**
* Implementation of {@link androidx.window.util.DataProducer} that produces
* {@link CommonFoldingFeature} parsed from a string stored in the resources config at
* {@link R.string#config_display_features}.
*/
public final class ResourceConfigDisplayFeatureProducer extends
BaseDataProducer<List<CommonFoldingFeature>> {
private static final boolean DEBUG = false;
private static final String TAG = "ResourceConfigDisplayFeatureProducer";
private final Context mContext;
public ResourceConfigDisplayFeatureProducer(@NonNull Context context) {
mContext = context;
}
@Override
@Nullable
public Optional<List<CommonFoldingFeature>> getData() {
String displayFeaturesString = mContext.getResources().getString(
R.string.config_display_features);
if (TextUtils.isEmpty(displayFeaturesString)) {
return Optional.empty();
}
List<CommonFoldingFeature> features = new ArrayList<>();
String[] featureStrings = displayFeaturesString.split(";");
for (String featureString : featureStrings) {
CommonFoldingFeature feature;
try {
feature = CommonFoldingFeature.parseFromString(featureString);
} catch (IllegalArgumentException e) {
if (DEBUG) {
Log.w(TAG, "Failed to parse display feature: " + featureString, e);
}
continue;
}
features.add(feature);
}
return Optional.of(features);
}
}

96
libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDevicePostureProducer.java
View File

@@ -1,96 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package androidx.window.common;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import androidx.window.util.BaseDataProducer;
import java.util.Optional;
/**
* Implementation of {@link androidx.window.util.DataProducer} that provides the device posture
* as an {@link Integer} from a value stored in {@link Settings}.
*/
public final class SettingsDevicePostureProducer extends BaseDataProducer<Integer> {
private static final String DEVICE_POSTURE = "device_posture";
private final Uri mDevicePostureUri =
Settings.Global.getUriFor(DEVICE_POSTURE);
private final ContentResolver mResolver;
private final ContentObserver mObserver;
private boolean mRegisteredObservers;
public SettingsDevicePostureProducer(@NonNull Context context) {
mResolver = context.getContentResolver();
mObserver = new SettingsObserver();
}
@Override
@Nullable
public Optional<Integer> getData() {
int posture = Settings.Global.getInt(mResolver, DEVICE_POSTURE, -1);
return posture == -1 ? Optional.empty() : Optional.of(posture);
}
/**
* Registers settings observers, if needed. When settings observers are registered for this
* producer callbacks for changes in data will be triggered.
*/
public void registerObserversIfNeeded() {
if (mRegisteredObservers) {
return;
}
mRegisteredObservers = true;
mResolver.registerContentObserver(mDevicePostureUri, false /* notifyForDescendants */,
mObserver /* ContentObserver */);
}
/**
* Unregisters settings observers, if needed. When settings observers are unregistered for this
* producer callbacks for changes in data will not be triggered.
*/
public void unregisterObserversIfNeeded() {
if (!mRegisteredObservers) {
return;
}
mRegisteredObservers = false;
mResolver.unregisterContentObserver(mObserver);
}
private final class SettingsObserver extends ContentObserver {
SettingsObserver() {
super(new Handler(Looper.getMainLooper()));
}
@Override
public void onChange(boolean selfChange, Uri uri) {
if (mDevicePostureUri.equals(uri)) {
notifyDataChanged();
}
}
}
}

30
libs/WindowManager/Jetpack/src/androidx/window/common/SettingsDisplayFeatureProducer.java
View File

@@ -16,8 +16,10 @@
package androidx.window.common; package androidx.window.common;
import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_UNKNOWN;
import static androidx.window.common.CommonFoldingFeature.parseListFromString;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver; import android.database.ContentObserver;
@@ -26,11 +28,10 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import androidx.window.util.BaseDataProducer; import androidx.window.util.BaseDataProducer;
import java.util.ArrayList; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -40,8 +41,6 @@ import java.util.Optional;
*/ */
public final class SettingsDisplayFeatureProducer public final class SettingsDisplayFeatureProducer
extends BaseDataProducer<List<CommonFoldingFeature>> { extends BaseDataProducer<List<CommonFoldingFeature>> {
private static final boolean DEBUG = false;
private static final String TAG = "SettingsDisplayFeatureProducer";
private static final String DISPLAY_FEATURES = "display_features"; private static final String DISPLAY_FEATURES = "display_features";
private final Uri mDisplayFeaturesUri = private final Uri mDisplayFeaturesUri =
@@ -57,32 +56,17 @@ public final class SettingsDisplayFeatureProducer
} }
@Override @Override
@Nullable @NonNull
public Optional<List<CommonFoldingFeature>> getData() { public Optional<List<CommonFoldingFeature>> getData() {
String displayFeaturesString = Settings.Global.getString(mResolver, DISPLAY_FEATURES); String displayFeaturesString = Settings.Global.getString(mResolver, DISPLAY_FEATURES);
if (displayFeaturesString == null) { if (displayFeaturesString == null) {
return Optional.empty(); return Optional.empty();
} }
List<CommonFoldingFeature> features = new ArrayList<>();
if (TextUtils.isEmpty(displayFeaturesString)) { if (TextUtils.isEmpty(displayFeaturesString)) {
return Optional.of(features); return Optional.of(Collections.emptyList());
} }
String[] featureStrings = displayFeaturesString.split(";"); return Optional.of(parseListFromString(displayFeaturesString, COMMON_STATE_UNKNOWN));
for (String featureString : featureStrings) {
CommonFoldingFeature feature;
try {
feature = CommonFoldingFeature.parseFromString(featureString);
} catch (IllegalArgumentException e) {
if (DEBUG) {
Log.w(TAG, "Failed to parse display feature: " + featureString, e);
}
continue;
}
features.add(feature);
}
return Optional.of(features);
} }
/** /**

74
libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java
View File

@@ -31,9 +31,7 @@ import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.window.common.CommonFoldingFeature; import androidx.window.common.CommonFoldingFeature;
import androidx.window.common.DeviceStateManagerPostureProducer; import androidx.window.common.DeviceStateManagerFoldingFeatureProducer;
import androidx.window.common.ResourceConfigDisplayFeatureProducer;
import androidx.window.common.SettingsDevicePostureProducer;
import androidx.window.common.SettingsDisplayFeatureProducer; import androidx.window.common.SettingsDisplayFeatureProducer;
import androidx.window.util.DataProducer; import androidx.window.util.DataProducer;
import androidx.window.util.PriorityDataProducer; import androidx.window.util.PriorityDataProducer;
@@ -60,27 +58,16 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
private final Map<Activity, Consumer<WindowLayoutInfo>> mWindowLayoutChangeListeners = private final Map<Activity, Consumer<WindowLayoutInfo>> mWindowLayoutChangeListeners =
new HashMap<>(); new HashMap<>();
private final SettingsDevicePostureProducer mSettingsDevicePostureProducer;
private final DataProducer<Integer> mDevicePostureProducer;
private final SettingsDisplayFeatureProducer mSettingsDisplayFeatureProducer; private final SettingsDisplayFeatureProducer mSettingsDisplayFeatureProducer;
private final DataProducer<List<CommonFoldingFeature>> mDisplayFeatureProducer; private final DataProducer<List<CommonFoldingFeature>> mFoldingFeatureProducer;
public WindowLayoutComponentImpl(Context context) { public WindowLayoutComponentImpl(Context context) {
mSettingsDevicePostureProducer = new SettingsDevicePostureProducer(context);
mDevicePostureProducer = new PriorityDataProducer<>(List.of(
mSettingsDevicePostureProducer,
new DeviceStateManagerPostureProducer(context)
));
mSettingsDisplayFeatureProducer = new SettingsDisplayFeatureProducer(context); mSettingsDisplayFeatureProducer = new SettingsDisplayFeatureProducer(context);
mDisplayFeatureProducer = new PriorityDataProducer<>(List.of( mFoldingFeatureProducer = new PriorityDataProducer<>(List.of(
mSettingsDisplayFeatureProducer, mSettingsDisplayFeatureProducer,
new ResourceConfigDisplayFeatureProducer(context) new DeviceStateManagerFoldingFeatureProducer(context)
)); ));
mFoldingFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged);
mDevicePostureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged);
mDisplayFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged);
} }
/** /**
@@ -121,25 +108,6 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
return !mWindowLayoutChangeListeners.isEmpty(); return !mWindowLayoutChangeListeners.isEmpty();
} }
/**
* Calculate the {@link CommonFoldingFeature.State} from the feature or the device posture
* producer.
* If the given {@link CommonFoldingFeature.State} is not valid then {@code null} will be
* returned. The {@link FoldingFeature} should be ignored in the case of an invalid
* {@link CommonFoldingFeature.State}.
*
* @param feature a {@link CommonFoldingFeature} to provide the feature state if present.
* @return {@link CommonFoldingFeature.State} of the hinge if present or the state from the
* posture produce if present.
*/
@Nullable
private Integer getFeatureState(CommonFoldingFeature feature) {
Integer featureState = feature.getState();
Optional<Integer> posture = mDevicePostureProducer.getData();
Integer state = featureState == null ? posture.orElse(null) : featureState;
return convertToExtensionState(state);
}
/** /**
* A convenience method to translate from the common feature state to the extensions feature * A convenience method to translate from the common feature state to the extensions feature
* state. More specifically, translates from {@link CommonFoldingFeature.State} to * state. More specifically, translates from {@link CommonFoldingFeature.State} to
@@ -152,10 +120,8 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
* {@link CommonFoldingFeature.State} and {@code null} otherwise. * {@link CommonFoldingFeature.State} and {@code null} otherwise.
*/ */
@Nullable @Nullable
private Integer convertToExtensionState(@Nullable Integer state) { private Integer convertToExtensionState(int state) {
if (state == null) { // The null check avoids a NullPointerException. if (state == COMMON_STATE_FLAT) {
return null;
} else if (state == COMMON_STATE_FLAT) {
return FoldingFeature.STATE_FLAT; return FoldingFeature.STATE_FLAT;
} else if (state == COMMON_STATE_HALF_OPENED) { } else if (state == COMMON_STATE_HALF_OPENED) {
return FoldingFeature.STATE_HALF_OPENED; return FoldingFeature.STATE_HALF_OPENED;
@@ -173,8 +139,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
@NonNull @NonNull
private WindowLayoutInfo getWindowLayoutInfo(@NonNull Activity activity) { private WindowLayoutInfo getWindowLayoutInfo(@NonNull Activity activity) {
List<DisplayFeature> displayFeatures = List<DisplayFeature> displayFeatures = getDisplayFeatures(activity);
getDisplayFeatures(activity);
return new WindowLayoutInfo(displayFeatures); return new WindowLayoutInfo(displayFeatures);
} }
@@ -184,13 +149,12 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
* {@link CommonFoldingFeature} is not valid then it will be omitted. * {@link CommonFoldingFeature} is not valid then it will be omitted.
* *
* For a {@link FoldingFeature} the bounds are localized into the {@link Activity} window * For a {@link FoldingFeature} the bounds are localized into the {@link Activity} window
* coordinate space and the state is calculated either from * coordinate space and the state is calculated from {@link CommonFoldingFeature#getState()}.
* {@link CommonFoldingFeature#getState()} or {@link #mDisplayFeatureProducer}. The state from * The state from {@link #mFoldingFeatureProducer} may not be valid since
* {@link #mDisplayFeatureProducer} may not be valid since {@link #mDisplayFeatureProducer} is * {@link #mFoldingFeatureProducer} is a general state controller. If the state is not valid,
* a general state controller. If the state is not valid, the {@link FoldingFeature} is omitted * the {@link FoldingFeature} is omitted from the {@link List} of {@link DisplayFeature}. If
* from the {@link List} of {@link DisplayFeature}. If the bounds are not valid, constructing a * the bounds are not valid, constructing a {@link FoldingFeature} will throw an
* {@link FoldingFeature} will throw an {@link IllegalArgumentException} since this can cause * {@link IllegalArgumentException} since this can cause negative UI effects down stream.
* negative UI effects down stream.
* *
* @param activity a proxy for the {@link android.view.Window} that contains the * @param activity a proxy for the {@link android.view.Window} that contains the
* {@link DisplayFeature}. * {@link DisplayFeature}.
@@ -211,11 +175,10 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
return features; return features;
} }
Optional<List<CommonFoldingFeature>> storedFeatures = mDisplayFeatureProducer.getData(); Optional<List<CommonFoldingFeature>> storedFeatures = mFoldingFeatureProducer.getData();
if (storedFeatures.isPresent()) { if (storedFeatures.isPresent()) {
for (CommonFoldingFeature baseFeature : storedFeatures.get()) { for (CommonFoldingFeature baseFeature : storedFeatures.get()) {
Integer state = getFeatureState(baseFeature); Integer state = convertToExtensionState(baseFeature.getState());
if (state == null) { if (state == null) {
continue; continue;
} }
@@ -223,8 +186,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
rotateRectToDisplayRotation(displayId, featureRect); rotateRectToDisplayRotation(displayId, featureRect);
transformToWindowSpaceRect(activity, featureRect); transformToWindowSpaceRect(activity, featureRect);
features.add(new FoldingFeature(featureRect, baseFeature.getType(), features.add(new FoldingFeature(featureRect, baseFeature.getType(), state));
getFeatureState(baseFeature)));
} }
} }
return features; return features;
@@ -232,10 +194,8 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
private void updateRegistrations() { private void updateRegistrations() {
if (hasListeners()) { if (hasListeners()) {
mSettingsDevicePostureProducer.registerObserversIfNeeded();
mSettingsDisplayFeatureProducer.registerObserversIfNeeded(); mSettingsDisplayFeatureProducer.registerObserversIfNeeded();
} else { } else {
mSettingsDevicePostureProducer.unregisterObserversIfNeeded();
mSettingsDisplayFeatureProducer.unregisterObserversIfNeeded(); mSettingsDisplayFeatureProducer.unregisterObserversIfNeeded();
} }

61
libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java
View File

@@ -30,9 +30,7 @@ import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.window.common.CommonFoldingFeature; import androidx.window.common.CommonFoldingFeature;
import androidx.window.common.DeviceStateManagerPostureProducer; import androidx.window.common.DeviceStateManagerFoldingFeatureProducer;
import androidx.window.common.ResourceConfigDisplayFeatureProducer;
import androidx.window.common.SettingsDevicePostureProducer;
import androidx.window.common.SettingsDisplayFeatureProducer; import androidx.window.common.SettingsDisplayFeatureProducer;
import androidx.window.util.DataProducer; import androidx.window.util.DataProducer;
import androidx.window.util.PriorityDataProducer; import androidx.window.util.PriorityDataProducer;
@@ -48,36 +46,23 @@ import java.util.Optional;
*/ */
class SampleSidecarImpl extends StubSidecar { class SampleSidecarImpl extends StubSidecar {
private static final String TAG = "SampleSidecar"; private static final String TAG = "SampleSidecar";
private static final boolean DEBUG = false;
private final SettingsDevicePostureProducer mSettingsDevicePostureProducer; private final DataProducer<List<CommonFoldingFeature>> mFoldingFeatureProducer;
private final DataProducer<Integer> mDevicePostureProducer;
private final SettingsDisplayFeatureProducer mSettingsDisplayFeatureProducer; private final SettingsDisplayFeatureProducer mSettingsFoldingFeatureProducer;
private final DataProducer<List<CommonFoldingFeature>> mDisplayFeatureProducer;
SampleSidecarImpl(Context context) { SampleSidecarImpl(Context context) {
mSettingsDevicePostureProducer = new SettingsDevicePostureProducer(context); mSettingsFoldingFeatureProducer = new SettingsDisplayFeatureProducer(context);
mDevicePostureProducer = new PriorityDataProducer<>(List.of( mFoldingFeatureProducer = new PriorityDataProducer<>(List.of(
mSettingsDevicePostureProducer, mSettingsFoldingFeatureProducer,
new DeviceStateManagerPostureProducer(context) new DeviceStateManagerFoldingFeatureProducer(context)
)); ));
mSettingsDisplayFeatureProducer = new SettingsDisplayFeatureProducer(context); mFoldingFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged);
mDisplayFeatureProducer = new PriorityDataProducer<>(List.of(
mSettingsDisplayFeatureProducer,
new ResourceConfigDisplayFeatureProducer(context)
));
mDevicePostureProducer.addDataChangedCallback(this::onDevicePostureChanged);
mDisplayFeatureProducer.addDataChangedCallback(this::onDisplayFeaturesChanged);
}
private void onDevicePostureChanged() {
updateDeviceState(getDeviceState());
} }
private void onDisplayFeaturesChanged() { private void onDisplayFeaturesChanged() {
updateDeviceState(getDeviceState());
for (IBinder windowToken : getWindowsListeningForLayoutChanges()) { for (IBinder windowToken : getWindowsListeningForLayoutChanges()) {
SidecarWindowLayoutInfo newLayout = getWindowLayoutInfo(windowToken); SidecarWindowLayoutInfo newLayout = getWindowLayoutInfo(windowToken);
updateWindowLayout(windowToken, newLayout); updateWindowLayout(windowToken, newLayout);
@@ -87,23 +72,17 @@ class SampleSidecarImpl extends StubSidecar {
@NonNull @NonNull
@Override @Override
public SidecarDeviceState getDeviceState() { public SidecarDeviceState getDeviceState() {
Optional<Integer> posture = mDevicePostureProducer.getData();
SidecarDeviceState deviceState = new SidecarDeviceState(); SidecarDeviceState deviceState = new SidecarDeviceState();
deviceState.posture = posture.orElse(deviceStateFromFeature()); deviceState.posture = deviceStateFromFeature();
return deviceState; return deviceState;
} }
private int deviceStateFromFeature() { private int deviceStateFromFeature() {
List<CommonFoldingFeature> storedFeatures = mDisplayFeatureProducer.getData() List<CommonFoldingFeature> storedFeatures = mFoldingFeatureProducer.getData()
.orElse(Collections.emptyList()); .orElse(Collections.emptyList());
for (int i = 0; i < storedFeatures.size(); i++) { for (int i = 0; i < storedFeatures.size(); i++) {
CommonFoldingFeature feature = storedFeatures.get(i); CommonFoldingFeature feature = storedFeatures.get(i);
final int state = feature.getState() == null ? -1 : feature.getState(); final int state = feature.getState();
if (DEBUG && feature.getState() == null) {
Log.d(TAG, "feature#getState was null for DisplayFeature: " + feature);
}
switch (state) { switch (state) {
case CommonFoldingFeature.COMMON_STATE_FLAT: case CommonFoldingFeature.COMMON_STATE_FLAT:
return SidecarDeviceState.POSTURE_OPENED; return SidecarDeviceState.POSTURE_OPENED;
@@ -127,20 +106,20 @@ class SampleSidecarImpl extends StubSidecar {
} }
private List<SidecarDisplayFeature> getDisplayFeatures(@NonNull Activity activity) { private List<SidecarDisplayFeature> getDisplayFeatures(@NonNull Activity activity) {
List<SidecarDisplayFeature> features = new ArrayList<>();
int displayId = activity.getDisplay().getDisplayId(); int displayId = activity.getDisplay().getDisplayId();
if (displayId != DEFAULT_DISPLAY) { if (displayId != DEFAULT_DISPLAY) {
Log.w(TAG, "This sample doesn't support display features on secondary displays"); Log.w(TAG, "This sample doesn't support display features on secondary displays");
return features; return Collections.emptyList();
} }
if (activity.isInMultiWindowMode()) { if (activity.isInMultiWindowMode()) {
// It is recommended not to report any display features in multi-window mode, since it // It is recommended not to report any display features in multi-window mode, since it
// won't be possible to synchronize the display feature positions with window movement. // won't be possible to synchronize the display feature positions with window movement.
return features; return Collections.emptyList();
} }
Optional<List<CommonFoldingFeature>> storedFeatures = mDisplayFeatureProducer.getData(); Optional<List<CommonFoldingFeature>> storedFeatures = mFoldingFeatureProducer.getData();
List<SidecarDisplayFeature> features = new ArrayList<>();
if (storedFeatures.isPresent()) { if (storedFeatures.isPresent()) {
for (CommonFoldingFeature baseFeature : storedFeatures.get()) { for (CommonFoldingFeature baseFeature : storedFeatures.get()) {
SidecarDisplayFeature feature = new SidecarDisplayFeature(); SidecarDisplayFeature feature = new SidecarDisplayFeature();
@@ -152,17 +131,15 @@ class SampleSidecarImpl extends StubSidecar {
features.add(feature); features.add(feature);
} }
} }
return features; return Collections.unmodifiableList(features);
} }
@Override @Override
protected void onListenersChanged() { protected void onListenersChanged() {
if (hasListeners()) { if (hasListeners()) {
mSettingsDevicePostureProducer.registerObserversIfNeeded(); mSettingsFoldingFeatureProducer.registerObserversIfNeeded();
mSettingsDisplayFeatureProducer.registerObserversIfNeeded();
} else { } else {
mSettingsDevicePostureProducer.unregisterObserversIfNeeded(); mSettingsFoldingFeatureProducer.unregisterObserversIfNeeded();
mSettingsDisplayFeatureProducer.unregisterObserversIfNeeded();
} }
} }
} }