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

Commit d14df14b authored by Nishith Khanna's avatar Nishith Khanna
Browse files

SystemUI: Theme according to our palette 

Theme quick settings to match our palette
Theme switches in various sub dialogs in quick settings
Theme screen record dialog
Theme internet dialog
Theme power menu
parent 4a431f1f

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/MaterialColors.kt

+32 −8
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settingslib.spa.framework.theme



import android.os.Build

import android.content.Context

import androidx.compose.material3.ColorScheme

import androidx.compose.material3.darkColorScheme

import androidx.compose.material3.dynamicDarkColorScheme
@@ -31,14 +32,37 @@ import androidx.compose.ui.platform.LocalContext 
internal fun materialColorScheme(isDarkTheme: Boolean): ColorScheme {

    val context = LocalContext.current

    return remember(isDarkTheme) {

        when {

            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {

                if (isDarkTheme) dynamicDarkColorScheme(context)

                else dynamicLightColorScheme(context)

      customTheme(isDarkTheme, context)

    }

            isDarkTheme -> darkColorScheme()

            else -> lightColorScheme()

}



private fun customTheme(isDarkTheme: Boolean, context: Context): ColorScheme {

  return if (isDarkTheme) {

    dynamicDarkColorScheme(context)

      .copy(

        primary = Color(0xFF5DB2FF),

        secondaryContainer = Color(0xFF1E1E1E),

        onSecondaryContainer = Color(0xDEFFFFFF),

        primaryContainer = Color(0xFF121212),

        onPrimaryContainer = Color(0xDEFFFFFF),

        surfaceContainer = Color(0xFF121212),

        surfaceVariant = Color(0xFF272727),

        surface = Color(0xFF272727),

        surfaceContainerHigh = Color(0xFF1E1E1E),

      )

  } else {

    dynamicLightColorScheme(context)

      .copy(

        primary = Color(0xFF0086FF),

        secondaryContainer = Color(0xFFFFFFFF),

        onSecondaryContainer = Color(0xDE000000),

        primaryContainer = Color(0xFFFFFFFF),

        onPrimaryContainer = Color(0xDE000000),

        surfaceContainer = Color(0xFFFFFFFF),

        surfaceVariant = Color(0xFFFFFFFF),

        surface = Color(0xFFF1F0F3),

        surfaceContainerHigh = Color(0xFFFFFFFF),

      )

  }

}

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ data class ThemeConfig( 
    fun getDefaultColor(context: Context): Int {

        return when {

            seedColor != null -> seedColor!!

            isDarkTheme -> context.resources.getColor(android.R.color.system_accent1_100)

            else -> context.resources.getColor(android.R.color.system_accent2_600)

            isDarkTheme -> context.resources.getColor(android.R.color.white)

            else -> context.resources.getColor(android.R.color.white)

        }

    }

}

packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

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

    <item android:color="@androidprv:color/materialColorSecondaryFixedDim"/>

    <item android:color="@*android:color/e_accent"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/drawable/ic_backspace_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="?android:attr/textColorPrimaryInverse"

        android:fillColor="?android:attr/colorBackground"

        android:pathData="M9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59L17.59,17L14,13.41L10.41,17L9,15.59zM21,6H8l-4.5,6L8,18h13V6M21,4c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H8c-0.63,0 -1.22,-0.3 -1.6,-0.8L1,12l5.4,-7.2C6.78,4.3 7.37,4 8,4H21L21,4z"/>

</vector>

packages/SystemUI/res-keyguard/drawable/ic_keyboard_tab_36dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
     android:viewportWidth="36"

     android:width="36sp">



  <path android:fillColor="?android:attr/textColorPrimaryInverse"

  <path android:fillColor="?android:attr/colorBackground"

        android:pathData="M17.59,13.41L21.17,17H7v2h14.17l-3.59,3.59L19,24l6,-6l-6,-6L17.59,

                          13.41zM26,12v12h2V12H26z"/>

</vector>