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

Commit 85eea2df authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge "Use quick settings theme for the privacy chip" into tm-dev am:... 

Merge "Use quick settings theme for the privacy chip" into tm-dev am: 6a45e90f am: 10cb8c75 am: fdaea9c9

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



Change-Id: I6a4b4bce2f02a770c660158c39ff52bb73b8ff0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 316085fe fdaea9c9

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.animation.AnimatorSet 
import android.animation.ValueAnimator

import android.content.Context

import android.graphics.Rect

import android.view.ContextThemeWrapper

import android.view.Gravity

import android.view.LayoutInflater

import android.view.View
@@ -46,6 +47,7 @@ class SystemEventChipAnimationController @Inject constructor( 
) : SystemStatusAnimationCallback {



    private lateinit var animationWindowView: FrameLayout

    private lateinit var themedContext: ContextThemeWrapper



    private var currentAnimatedView: BackgroundAnimatableView? = null
@@ -76,7 +78,7 @@ class SystemEventChipAnimationController @Inject constructor( 


        // Initialize the animated view

        val insets = contentInsetsProvider.getStatusBarContentInsetsForCurrentRotation()

        currentAnimatedView = viewCreator(context).also {

        currentAnimatedView = viewCreator(themedContext).also {

            animationWindowView.addView(

                    it.view,

                    layoutParamsDefault(
@@ -221,7 +223,8 @@ class SystemEventChipAnimationController @Inject constructor( 


    private fun init() {

        initialized = true

        animationWindowView = LayoutInflater.from(context)

        themedContext = ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings)

        animationWindowView = LayoutInflater.from(themedContext)

                .inflate(R.layout.system_event_animation_window, null) as FrameLayout

        val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)

        lp.gravity = Gravity.END or Gravity.CENTER_VERTICAL