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

Commit 5c6b6ce4 authored by Nick Chameyev's avatar Nick Chameyev
Browse files

Use application context in DeviceFoldStateProvider 

Get application context from the passed context in
DeviceFoldStateProvider as in case of using display context
the configuration won't be updated automatically.

We use display context in live wallpapers because Service
context doesn't return a display (Context#getDisplay) as Service
is not a UI context.

Application context will use default display's configuration which
should be acceptable as the rest of the code relies on the default
display too (e.g. screen callbacks are delivered only for the
default display). Application context's configuration is updated
normally on fold/unfold.

Bug: 377280470
Test: check that we don't play animation on rear camera selfie mode
Flag: EXEMPT bugfix
Change-Id: I989c2be83187816b247b3f41e5a3755be361592e
parent 6e776a24

packages/SystemUI/multivalentTests/src/com/android/systemui/unfold/updates/DeviceFoldStateProviderTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ class DeviceFoldStateProviderTest : SysuiTestCase() { 
        whenever(mainLooper.isCurrentThread).thenReturn(true)

        whenever(mainLooper.thread).thenReturn(thread)

        whenever(thread.name).thenReturn("backgroundThread")

        whenever(context.applicationContext).thenReturn(context)

        whenever(context.resources).thenReturn(resources)

        whenever(context.mainExecutor).thenReturn(mContext.mainExecutor)

packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ constructor( 
    }



    private fun isOnLargeScreen(): Boolean {

        return context.resources.configuration.smallestScreenWidthDp >

        return context.applicationContext.resources.configuration.smallestScreenWidthDp >

            INNER_SCREEN_SMALLEST_SCREEN_WIDTH_THRESHOLD_DP

    }