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

Commit 33dfa287 authored by Catherine Liang's avatar Catherine Liang
Browse files

Fix floating sheet overlap with 3 button navigation bar 

Flag: EXEMPT bug fix
Bug: 359425694
Test: manually verified in color, clock, shortcuts, grid pickers
Test: manually verified on handhelds & foldables
Change-Id: I2e8b7f7837ff210d701cf70225c979ba9be2452f
parent 69d532b7

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

+12 −0
Original line number Diff line number Diff line
@@ -19,9 +19,13 @@ import android.os.Bundle 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup.MarginLayoutParams

import androidx.cardview.widget.CardView

import androidx.core.content.ContextCompat

import androidx.core.view.ViewCompat

import androidx.core.view.WindowInsetsCompat

import androidx.core.view.isVisible

import androidx.core.view.updateLayoutParams

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get

import androidx.transition.Transition
@@ -61,6 +65,14 @@ class ClockSettingsFragment : AppbarFragment() { 
                container,

                false,

            )

        ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->

            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())

            v.updateLayoutParams<MarginLayoutParams> {

                topMargin = insets.top

                bottomMargin = insets.bottom

            }

            WindowInsetsCompat.CONSUMED

        }

        setUpToolbar(view)



        val context = requireContext()

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

+13 −0
Original line number Diff line number Diff line
@@ -20,10 +20,14 @@ import android.os.Bundle 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup.MarginLayoutParams

import android.widget.FrameLayout

import androidx.cardview.widget.CardView

import androidx.core.content.ContextCompat

import androidx.core.view.ViewCompat

import androidx.core.view.WindowInsetsCompat

import androidx.core.view.isVisible

import androidx.core.view.updateLayoutParams

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get

import androidx.lifecycle.lifecycleScope
@@ -70,7 +74,16 @@ class ColorPickerFragment : AppbarFragment() { 
                container,

                false,

            )

        ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->

            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())

            v.updateLayoutParams<MarginLayoutParams> {

                topMargin = insets.top

                bottomMargin = insets.bottom

            }

            WindowInsetsCompat.CONSUMED

        }

        setUpToolbar(view)



        val injector = InjectorProvider.getInjector() as ThemePickerInjector

        val lockScreenView: CardView = view.requireViewById(R.id.lock_preview)

        val homeScreenView: CardView = view.requireViewById(R.id.home_preview)

src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt

+12 −0
Original line number Diff line number Diff line
@@ -22,10 +22,14 @@ import android.util.Log 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup.MarginLayoutParams

import android.widget.Button

import android.widget.Toast

import androidx.core.content.ContextCompat

import androidx.core.view.ViewCompat

import androidx.core.view.WindowInsetsCompat

import androidx.core.view.isVisible

import androidx.core.view.updateLayoutParams

import androidx.lifecycle.ViewModelProvider

import androidx.transition.Transition

import androidx.transition.doOnStart
@@ -66,6 +70,14 @@ class GridFragment : AppbarFragment() { 
                container,

                false,

            )

        ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->

            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())

            v.updateLayoutParams<MarginLayoutParams> {

                topMargin = insets.top

                bottomMargin = insets.bottom

            }

            WindowInsetsCompat.CONSUMED

        }

        setUpToolbar(view)



        val isGridApplyButtonEnabled = BaseFlags.get().isGridApplyButtonEnabled(requireContext())

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

+14 −0
Original line number Diff line number Diff line
@@ -21,8 +21,12 @@ import android.os.Bundle 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup.MarginLayoutParams

import androidx.core.content.ContextCompat

import androidx.core.view.ViewCompat

import androidx.core.view.WindowInsetsCompat

import androidx.core.view.isVisible

import androidx.core.view.updateLayoutParams

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get

import androidx.transition.Transition
@@ -38,6 +42,7 @@ import com.android.wallpaper.picker.AppbarFragment 
class KeyguardQuickAffordancePickerFragment : AppbarFragment() {

    companion object {

        const val DESTINATION_ID = "quick_affordances"



        @JvmStatic

        fun newInstance(): KeyguardQuickAffordancePickerFragment {

            return KeyguardQuickAffordancePickerFragment()
@@ -55,7 +60,16 @@ class KeyguardQuickAffordancePickerFragment : AppbarFragment() { 
                container,

                false,

            )

        ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->

            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())

            v.updateLayoutParams<MarginLayoutParams> {

                topMargin = insets.top

                bottomMargin = insets.bottom

            }

            WindowInsetsCompat.CONSUMED

        }

        setUpToolbar(view)



        val injector = InjectorProvider.getInjector() as ThemePickerInjector

        val viewModel: KeyguardQuickAffordancePickerViewModel =

            ViewModelProvider(