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

Commit e7fc2f52 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dual Shade] Remove the obsolete `getTopEdgeSplitFraction()` method." into main

parents 63e8deb6 c8490140

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeModeInteractorImplTest.kt

+0 −20
Original line number Diff line number Diff line
@@ -101,24 +101,4 @@ class ShadeModeInteractorImplTest : SysuiTestCase() { 
            assertThat(shadeMode).isNotEqualTo(ShadeMode.Dual)

            assertThat(underTest.isDualShade).isFalse()

        }



    @Test

    fun getTopEdgeSplitFraction_narrowScreen_splitInHalf() =

        testScope.runTest {

            val shadeMode by collectLastValue(underTest.shadeMode)

            kosmos.enableDualShade(wideLayout = false)



            assertThat(shadeMode).isEqualTo(ShadeMode.Dual)

            assertThat(underTest.getTopEdgeSplitFraction()).isEqualTo(0.5f)

        }



    @Test

    fun getTopEdgeSplitFraction_wideScreen_splitInHalf() =

        testScope.runTest {

            val shadeMode by collectLastValue(underTest.shadeMode)

            kosmos.enableDualShade(wideLayout = true)



            assertThat(shadeMode).isEqualTo(ShadeMode.Dual)

            assertThat(underTest.getTopEdgeSplitFraction()).isEqualTo(0.5f)

        }

}

packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeModeInteractor.kt

+0 −19
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.shade.domain.interactor



import android.provider.Settings

import androidx.annotation.FloatRange

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.log.table.TableLogBuffer
@@ -68,20 +67,6 @@ interface ShadeModeInteractor { 
    /** Convenience shortcut for querying whether the current [shadeMode] is [ShadeMode.Split]. */

    val isSplitShade: Boolean

        get() = shadeMode.value is ShadeMode.Split



    /**

     * The fraction between [0..1] (i.e., percentage) of screen width to consider the threshold

     * between "top-left" and "top-right" for the purposes of dual-shade invocation.

     *

     * When the dual-shade is not wide, this always returns 0.5 (the top edge is evenly split). On

     * wide layouts however, a larger fraction is returned because only the area of the system

     * status icons is considered top-right.

     *

     * Note that this fraction only determines the split between the absolute left and right

     * directions. In RTL layouts, the "top-start" edge will resolve to "top-right", and "top-end"

     * will resolve to "top-left".

     */

    @FloatRange(from = 0.0, to = 1.0) fun getTopEdgeSplitFraction(): Float

}



class ShadeModeInteractorImpl
@@ -117,8 +102,6 @@ constructor( 
            .logDiffsForTable(tableLogBuffer = tableLogBuffer, initialValue = shadeModeInitialValue)

            .stateIn(applicationScope, SharingStarted.Eagerly, initialValue = shadeModeInitialValue)



    @FloatRange(from = 0.0, to = 1.0) override fun getTopEdgeSplitFraction(): Float = 0.5f



    private fun determineShadeMode(

        isDualShadeEnabled: Boolean,

        isShadeLayoutWide: Boolean,
@@ -141,6 +124,4 @@ class ShadeModeInteractorEmptyImpl @Inject constructor() : ShadeModeInteractor { 
    override val shadeMode: StateFlow<ShadeMode> = MutableStateFlow(ShadeMode.Single)



    override val isShadeLayoutWide: StateFlow<Boolean> = MutableStateFlow(false)



    override fun getTopEdgeSplitFraction(): Float = 0.5f

}