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

Commit b4133767 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Add dialog launch animations" into sc-v2-dev am: 9fbcffdf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16017858

Change-Id: Id3c94cec67f06611ad6c50fdf892801cb9fc24c3
parents 18ef55cd 9fbcffdf

packages/SystemUI/res/layout/qs_user_dialog_content.xml

+66 −62
Original line number Diff line number Diff line
@@ -16,15 +16,17 @@ 
  ~ limitations under the License.

  -->



<androidx.constraintlayout.widget.ConstraintLayout

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:padding="24dp"

        android:layout_marginStart="16dp"

        android:layout_marginEnd="16dp"

    android:background="@drawable/qs_dialog_bg"

    >

        <TextView

            android:id="@+id/title"
@@ -86,4 +88,6 @@ 
            sysui:layout_constraintEnd_toEndOf="parent"

            style="@style/Widget.QSDialog.Button"

            />



    </androidx.constraintlayout.widget.ConstraintLayout>

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/values-night/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android">



    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Dialog" />

    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Dialog">

        <item name="android:buttonCornerRadius">28dp</item>

    </style>



    <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Dialog.Alert" />

packages/SystemUI/res/values/styles.xml

+5 −15
Original line number Diff line number Diff line
@@ -417,7 +417,9 @@ 
        <item name="android:windowIsFloating">true</item>

    </style>



    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />

    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog">

        <item name="android:buttonCornerRadius">28dp</item>

    </style>



    <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
@@ -933,26 +935,14 @@ 
        <item name="actionDividerHeight">32dp</item>

    </style>



    <style name="Theme.SystemUI.Dialog.QSDialog">

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowIsFloating">true</item>

        <item name="android:backgroundDimEnabled">true</item>

        <item name="android:windowCloseOnTouchOutside">true</item>

        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>

        <item name="android:dialogCornerRadius">28dp</item>

        <item name="android:buttonCornerRadius">28dp</item>

        <item name="android:colorBackground">@color/prv_color_surface</item>

    </style>



    <style name="TextAppearance.QSDialog.Title" parent="Theme.SystemUI.Dialog.QSDialog">

    <style name="TextAppearance.QSDialog.Title" parent="Theme.SystemUI.Dialog">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">24sp</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:lineHeight">32sp</item>

    </style>



    <style name="Widget.QSDialog.Button" parent = "Theme.SystemUI.Dialog.QSDialog">

    <style name="Widget.QSDialog.Button" parent = "Theme.SystemUI.Dialog">

        <item name="android:background">@drawable/qs_dialog_btn_filled</item>

        <item name="android:textColor">@color/prv_text_color_on_accent</item>

        <item name="android:textSize">14sp</item>

packages/SystemUI/src/com/android/systemui/qs/user/UserDialog.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.systemui.R 
 */

class UserDialog(

    context: Context

) : SystemUIDialog(context, R.style.Theme_SystemUI_Dialog_QSDialog) {

) : SystemUIDialog(context) {



    // create() is no-op after creation

    private lateinit var _doneButton: View
@@ -72,7 +72,7 @@ class UserDialog( 
            attributes.fitInsetsTypes = attributes.fitInsetsTypes or WindowInsets.Type.statusBars()

            attributes.receiveInsetsIgnoringZOrder = true

            setLayout(

                    context.resources.getDimensionPixelSize(R.dimen.qs_panel_width),

                    context.resources.getDimensionPixelSize(R.dimen.notification_panel_width),

                    ViewGroup.LayoutParams.WRAP_CONTENT

            )

            setGravity(Gravity.CENTER)

packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt

+11 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Intent 
import android.provider.Settings

import android.view.View

import androidx.annotation.VisibleForTesting

import com.android.systemui.animation.DialogLaunchAnimator

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.plugins.FalsingManager
@@ -36,6 +37,7 @@ class UserSwitchDialogController @VisibleForTesting constructor( 
    private val userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>,

    private val activityStarter: ActivityStarter,

    private val falsingManager: FalsingManager,

    private val dialogLaunchAnimator: DialogLaunchAnimator,

    private val dialogFactory: (Context) -> UserDialog

) {
@@ -43,11 +45,13 @@ class UserSwitchDialogController @VisibleForTesting constructor( 
    constructor(

        userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>,

        activityStarter: ActivityStarter,

        falsingManager: FalsingManager

        falsingManager: FalsingManager,

        dialogLaunchAnimator: DialogLaunchAnimator

    ) : this(

        userDetailViewAdapterProvider,

        activityStarter,

        falsingManager,

        dialogLaunchAnimator,

        { UserDialog(it) }

    )
@@ -69,7 +73,11 @@ class UserSwitchDialogController @VisibleForTesting constructor( 


            settingsButton.setOnClickListener {

                if (!falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {

                    activityStarter.postStartActivityDismissingKeyguard(USER_SETTINGS_INTENT, 0)

                    dialogLaunchAnimator.disableAllCurrentDialogsExitAnimations()

                    activityStarter.postStartActivityDismissingKeyguard(

                        USER_SETTINGS_INTENT,

                        0

                    )

                }

                dismiss()

            }
@@ -81,7 +89,7 @@ class UserSwitchDialogController @VisibleForTesting constructor( 
            }

            adapter.linkToViewGroup(grid)



            show()

            dialogLaunchAnimator.showFromView(this, view)

        }

    }

}
 
 No newline at end of file