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

Commit dc99480f authored by Nick Chameyev's avatar Nick Chameyev
Browse files

Add initial unfold animation prototype under feature flag 

Introduces interfaces and classes for subscribing to hinge
update events, unfold transition progress controller that
uses dynamic animations to calculate current transition
progress. Added linear light reveal scrim overlay as an
example of transition progress subscriber.

Bug: 190818044
Test: manual
Change-Id: Ibf73a8c7dfa534432e0ed3ad637f0277bc7aafb9
parent ad502315

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -657,6 +657,9 @@ 
    <!-- Indicate the display area rect for foldable devices in folded state. -->

    <string name="config_foldedArea"></string>



    <!-- Indicates whether to enable an animation when unfolding a device or not -->

    <bool name="config_unfoldTransitionEnabled">false</bool>



    <!-- Indicates that the device supports having more than one internal display on at the same

         time. Only applicable to devices with more than one internal display. If this option is

         set to false, DisplayManager will make additional effort to ensure no more than 1 internal

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3837,6 +3837,7 @@ 
  <java-symbol type="array" name="config_foldedDeviceStates" />

  <java-symbol type="string" name="config_foldedArea" />

  <java-symbol type="bool" name="config_supportsConcurrentInternalDisplays" />

  <java-symbol type="bool" name="config_unfoldTransitionEnabled" />



  <java-symbol type="array" name="config_disableApksUnlessMatchedSku_apk_list" />

  <java-symbol type="array" name="config_disableApkUnlessMatchedSku_skus_list" />

packages/SystemUI/shared/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ android_library { 


    static_libs: [

        "PluginCoreLib",

        "androidx.dynamicanimation_dynamicanimation",

    ],

    java_version: "1.8",

    min_sdk_version: "26",

packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackController.java→packages/SystemUI/shared/src/com/android/systemui/statusbar/policy/CallbackController.java

+0 −0

File moved.

View file

packages/SystemUI/shared/src/com/android/unfold/UnfoldTransitionFactory.kt

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */

@file:JvmName("UnfoldTransitionFactory")



package com.android.unfold



import android.content.Context

import android.hardware.SensorManager

import android.hardware.devicestate.DeviceStateManager

import android.os.Handler

import com.android.unfold.updates.screen.ScreenStatusProvider

import com.android.unfold.config.ANIMATION_MODE_HINGE_ANGLE

import com.android.unfold.config.ResourceUnfoldTransitionConfig

import com.android.unfold.config.UnfoldTransitionConfig

import com.android.unfold.progress.FixedTimingTransitionProgressProvider

import com.android.unfold.progress.PhysicsBasedUnfoldTransitionProgressProvider

import com.android.unfold.updates.DeviceFoldStateProvider

import com.android.unfold.updates.hinge.EmptyHingeAngleProvider

import com.android.unfold.updates.hinge.RotationSensorHingeAngleProvider

import java.lang.IllegalStateException

import java.util.concurrent.Executor



fun createUnfoldTransitionProgressProvider(

    context: Context,

    config: UnfoldTransitionConfig,

    screenStatusProvider: ScreenStatusProvider,

    deviceStateManager: DeviceStateManager,

    sensorManager: SensorManager,

    mainHandler: Handler,

    mainExecutor: Executor

): UnfoldTransitionProgressProvider {



    if (!config.isEnabled) {

        throw IllegalStateException("Trying to create " +

            "UnfoldTransitionProgressProvider when the transition is disabled")

    }



    val hingeAngleProvider =

        if (config.mode == ANIMATION_MODE_HINGE_ANGLE) {

            RotationSensorHingeAngleProvider(sensorManager)

        } else {

            EmptyHingeAngleProvider()

        }



    val foldStateProvider = DeviceFoldStateProvider(

        context,

        hingeAngleProvider,

        screenStatusProvider,

        deviceStateManager,

        mainExecutor

    )



    return if (config.mode == ANIMATION_MODE_HINGE_ANGLE) {

        PhysicsBasedUnfoldTransitionProgressProvider(

            mainHandler,

            foldStateProvider

        )

    } else {

        FixedTimingTransitionProgressProvider(foldStateProvider)

    }

}



fun createConfig(context: Context): UnfoldTransitionConfig =

    ResourceUnfoldTransitionConfig(context)