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

Commit 9bc58ae3 authored by Luciano Pacheco's avatar Luciano Pacheco
Browse files

DocsUI M3: Use the config force_material3 

Change the helper isUseMaterial3FlagEnabled() to take into account the
config force_material3 in addition to the flag use_materail3.

Bug: 403375773
Test: atest DocumentsUIGoogleTests
Flag: com.android.documentsui.flags.use_material3
Change-Id: I8db74fdb0e7bd74620caf96be5c26127e6581748
parent 15c8801c

src/com/android/documentsui/util/FlagUtils.kt

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class FlagUtils { 
    companion object {

        @JvmStatic

        fun isUseMaterial3FlagEnabled(): Boolean {

            return Flags.useMaterial3()

            return Flags.useMaterial3() && Material3Config.getInstance().forceMaterial3 == true

        }



        @JvmStatic

src/com/android/documentsui/util/ThemeUtils.kt

+2 −4
Original line number Diff line number Diff line
@@ -374,13 +374,11 @@ abstract class Material3Config private constructor() { 
    @JvmStatic

    @AnyRes

    fun getRes(@AnyRes originalResourceId: Int): Int {

      // NOTE: isUseMaterial3FlagEnabled() already checks for the config forceMaterial3.

      if (!isUseMaterial3FlagEnabled()) {

        return originalResourceId

      }

      // TODO(lucmult): Enable this condition when all the resources are merged in one APK.

      // if (!(Material3Config.getInstance().forceMaterial3 ?: false)) {

      //   return originalResourceId

      // }



      if (!initialized) {

        initializeIdMapping()

      }