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

Unverified Commit dc1263a5 authored by LuK1337's avatar LuK1337 Committed by Michael Bestas
Browse files

ThemePicker: Apply window insets to fragments 



Adapt to system window insets (e.g. navigation bar) for the
customization screens for clock, colors, app grid, and
lockscreen shortcuts.

Co-authored-by: default avatarTommy Webb <tommy@calyxinstitute.org>
Change-Id: Ia53e574c9b8cf034327183448292cd0c14858c52
parent 34f601c1

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

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

import android.view.View

import android.view.ViewGroup

import android.view.WindowInsets

import androidx.cardview.widget.CardView

import androidx.core.content.ContextCompat

import androidx.core.view.isVisible
@@ -63,6 +64,17 @@ class ClockSettingsFragment : AppbarFragment() { 
            )

        setUpToolbar(view)



        // For nav bar edge-to-edge effect.

        view.setOnApplyWindowInsetsListener { v: View, windowInsets: WindowInsets ->

            v.setPadding(

                v.paddingLeft,

                v.paddingTop,

                v.paddingRight,

                windowInsets.systemWindowInsetBottom

            )

            windowInsets

        }



        val context = requireContext()

        val activity = requireActivity()

        val injector = InjectorProvider.getInjector() as ThemePickerInjector

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

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

import android.view.View

import android.view.ViewGroup

import android.view.WindowInsets

import android.widget.FrameLayout

import androidx.cardview.widget.CardView

import androidx.core.content.ContextCompat
@@ -71,6 +72,18 @@ class ColorPickerFragment : AppbarFragment() { 
                false,

            )

        setUpToolbar(view)



        // For nav bar edge-to-edge effect.

        view.setOnApplyWindowInsetsListener { v: View, windowInsets: WindowInsets ->

            v.setPadding(

                v.paddingLeft,

                v.paddingTop,

                v.paddingRight,

                windowInsets.systemWindowInsetBottom

            )

            windowInsets

        }



        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,6 +22,7 @@ import android.util.Log 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.view.WindowInsets

import android.widget.Button

import android.widget.Toast

import androidx.core.content.ContextCompat
@@ -68,6 +69,17 @@ class GridFragment : AppbarFragment() { 
            )

        setUpToolbar(view)



        // For nav bar edge-to-edge effect.

        view.setOnApplyWindowInsetsListener { v: View, windowInsets: WindowInsets ->

            v.setPadding(

                v.paddingLeft,

                v.paddingTop,

                v.paddingRight,

                windowInsets.systemWindowInsetBottom

            )

            windowInsets

        }



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



        val injector = InjectorProvider.getInjector() as ThemePickerInjector

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

+13 −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 android.view.WindowInsets

import androidx.core.content.ContextCompat

import androidx.core.view.isVisible

import androidx.lifecycle.ViewModelProvider
@@ -56,6 +57,18 @@ class KeyguardQuickAffordancePickerFragment : AppbarFragment() { 
                false,

            )

        setUpToolbar(view)



        // For nav bar edge-to-edge effect.

        view.setOnApplyWindowInsetsListener { v: View, windowInsets: WindowInsets ->

            v.setPadding(

                v.paddingLeft,

                v.paddingTop,

                v.paddingRight,

                windowInsets.systemWindowInsetBottom

            )

            windowInsets

        }



        val injector = InjectorProvider.getInjector() as ThemePickerInjector

        val viewModel: KeyguardQuickAffordancePickerViewModel =

            ViewModelProvider(