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

Commit 8b06125d authored by Catherine Liang's avatar Catherine Liang Committed by Automerger Merge Worker
Browse files

Merge "Fix wallpaper picker navigation bar colors (2/2)" into udc-qpr-dev am: f1b765d6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23781225



Change-Id: I29156fcd16745eeb156fbd2848ad2a7321797797
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a22c5b3 f1b765d6

src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Bundle 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import androidx.core.content.ContextCompat

import androidx.core.view.isVisible

import androidx.lifecycle.ViewModelProvider

import androidx.transition.Transition
@@ -99,6 +100,14 @@ class GridFragment2 : AppbarFragment() { 
        return getString(R.string.grid_title)

    }



    override fun getToolbarColorId(): Int {

        return android.R.color.transparent

    }



    override fun getToolbarTextColor(): Int {

        return ContextCompat.getColor(requireContext(), R.color.system_on_surface)

    }



    private fun bindScreenPreview(

        view: View,

        wallpaperInfoFactory: CurrentWallpaperInfoFactory,

src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.view.LayoutInflater 
import android.view.View

import android.view.ViewGroup

import androidx.cardview.widget.CardView

import androidx.core.content.ContextCompat

import androidx.core.view.isVisible

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get
@@ -145,4 +146,8 @@ class ClockSettingsFragment : AppbarFragment() { 
    override fun getToolbarColorId(): Int {

        return android.R.color.transparent

    }



    override fun getToolbarTextColor(): Int {

        return ContextCompat.getColor(requireContext(), R.color.system_on_surface)

    }

}

src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.view.View 
import android.view.ViewGroup

import android.widget.FrameLayout

import androidx.cardview.widget.CardView

import androidx.core.content.ContextCompat

import androidx.core.view.isVisible

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get
@@ -245,4 +246,8 @@ class ColorPickerFragment : AppbarFragment() { 
    override fun getToolbarColorId(): Int {

        return android.R.color.transparent

    }



    override fun getToolbarTextColor(): Int {

        return ContextCompat.getColor(requireContext(), R.color.system_on_surface)

    }

}

src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Bundle 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import androidx.core.content.ContextCompat

import androidx.core.view.isVisible

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get
@@ -94,4 +95,8 @@ class KeyguardQuickAffordancePickerFragment : AppbarFragment() { 
    override fun getToolbarColorId(): Int {

        return android.R.color.transparent

    }



    override fun getToolbarTextColor(): Int {

        return ContextCompat.getColor(requireContext(), R.color.system_on_surface)

    }

}