Merge "Flag FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY false when allow_rotation is set"

This commit is contained in:
Alex Chau
2021-01-14 17:25:49 +00:00
committed by Android (Google) Code Review

View File

@@ -49,6 +49,7 @@ import androidx.annotation.NonNull;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.testing.TestProtocol;
import com.android.launcher3.touch.PagedOrientationHandler;
@@ -156,7 +157,8 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
Resources res = context.getResources();
int originalSmallestWidth = res.getConfiguration().smallestScreenWidthDp
* res.getDisplayMetrics().densityDpi / DENSITY_DEVICE_STABLE;
if (originalSmallestWidth < 600) {
if (originalSmallestWidth < 600 && !mContext.getResources().getBoolean(
R.bool.allow_rotation)) {
mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY;
}
mFlags |= FLAG_SWIPE_UP_NOT_RUNNING;