Snap for 12265118 from f705dddb80da27a4e193b8bff96ff1bb269af258 to 24Q4-release (c07162f7) · Commits · e / os / android_packages_apps_ThemePicker

AndroidManifest.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,16 @@
		android:theme="@style/CustomizationTheme.NoActionBar"
		android:exported="false"/>

		<activity
		tools:node="replace"
		android:name="com.android.wallpaper.picker.customization.ui.CustomizationPickerActivity2"
		android:label="@string/app_name"
		android:relinquishTaskIdentity="true"
		android:resizeableActivity="false"
		android:theme="@style/WallpaperTheme"
		android:configChanges="assetsPaths"
		android:exported="false"/>

		<activity
		tools:node="replace"
		android:name="com.android.wallpaper.picker.PassThroughCustomizationPickerActivity"

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/clock/ui/view/ClockViewFactoryImpl.kt

+15 −7

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.customization.picker.clock.ui.view
		import android.app.WallpaperColors
		import android.app.WallpaperManager
		import android.content.Context
		import android.content.res.Resources
		import android.graphics.Point
		import android.graphics.Rect
		import android.view.View
		@@ -26,6 +25,7 @@ import android.widget.FrameLayout
		import androidx.annotation.ColorInt
		import androidx.core.text.util.LocalePreferences
		import androidx.lifecycle.LifecycleOwner
		import com.android.internal.policy.SystemBarUtils
		import com.android.systemui.plugins.clocks.ClockController
		import com.android.systemui.plugins.clocks.WeatherData
		import com.android.systemui.shared.clocks.ClockRegistry
		@@ -106,6 +106,7 @@ class ClockViewFactoryImpl(
		}

		private fun getSmallClockTopMargin() =
		getStatusBarHeight(appContext) +
		appContext.resources.getDimensionPixelSize(
		com.android.systemui.customization.R.dimen.small_clock_padding_top
		)
		@@ -256,11 +257,18 @@ class ClockViewFactoryImpl(
		const val TEMPERATURE_CELSIUS_PLACEHOLDER = 21
		val WEATHERICON_PLACEHOLDER = WeatherData.WeatherStateIcon.MOSTLY_SUNNY

		private fun getStatusBarHeight(resource: Resources): Int {
		private fun getStatusBarHeight(context: Context): Int {

		val display = context.displayNoVerify
		if (display != null) {
		return SystemBarUtils.getStatusBarHeight(context.resources, display.cutout)
		}

		var result = 0
		val resourceId: Int = resource.getIdentifier("status_bar_height", "dimen", "android")
		val resourceId: Int =
		context.resources.getIdentifier("status_bar_height", "dimen", "android")
		if (resourceId > 0) {
		result = resource.getDimensionPixelSize(resourceId)
		result = context.resources.getDimensionPixelSize(resourceId)
		}
		return result
		}

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())