Merge "Create New Class for Region Darkness Enum" (5ffeefe0) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@ import android.content.res.Resources
	import android.graphics.drawable.Drawable		import android.graphics.drawable.Drawable
	import android.view.View		import android.view.View
	import com.android.systemui.plugins.annotations.ProvidesInterface		import com.android.systemui.plugins.annotations.ProvidesInterface
			import com.android.systemui.shared.regionsampling.RegionDarkness
	import java.io.PrintWriter		import java.io.PrintWriter
	import java.util.Locale		import java.util.Locale
	import java.util.TimeZone		import java.util.TimeZone
	@@ -116,12 +117,3 @@ data class ClockMetadata(
	val clockId: ClockId,		val clockId: ClockId,
	val name: String		val name: String
	)		)

	/**
	* Enum for whether clock region is dark or light.
	*/
	enum class RegionDarkness(val isDark: Boolean) {
	DEFAULT(false),
	DARK(true),
	LIGHT(false)
	}

0 → 100644

+10 −0

Original line number	Original line	Diff line number	Diff line
			package com.android.systemui.shared.regionsampling

			/**
			* Enum for whether clock region is dark or light.
			*/
			enum class RegionDarkness(val isDark: Boolean) {
			DEFAULT(false),
			DARK(true),
			LIGHT(false)
			}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,8 @@ import com.android.systemui.plugins.ClockEvents
	import com.android.systemui.plugins.ClockId		import com.android.systemui.plugins.ClockId
	import com.android.systemui.plugins.ClockMetadata		import com.android.systemui.plugins.ClockMetadata
	import com.android.systemui.plugins.ClockProvider		import com.android.systemui.plugins.ClockProvider
	import com.android.systemui.plugins.RegionDarkness
	import com.android.systemui.shared.R		import com.android.systemui.shared.R
			import com.android.systemui.shared.regionsampling.RegionDarkness
	import java.io.PrintWriter		import java.io.PrintWriter
	import java.util.Locale		import java.util.Locale
	import java.util.TimeZone		import java.util.TimeZone

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.systemui.shared.regionsampling
	import android.graphics.Rect		import android.graphics.Rect
	import android.view.View		import android.view.View
	import androidx.annotation.VisibleForTesting		import androidx.annotation.VisibleForTesting
	import com.android.systemui.plugins.RegionDarkness
	import com.android.systemui.shared.navigationbar.RegionSamplingHelper		import com.android.systemui.shared.navigationbar.RegionSamplingHelper
	import com.android.systemui.shared.navigationbar.RegionSamplingHelper.SamplingCallback		import com.android.systemui.shared.navigationbar.RegionSamplingHelper.SamplingCallback
	import java.io.PrintWriter		import java.io.PrintWriter