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

Commit bea8c64a authored Nov 25, 2022 by Zekan Qian Committed by Android (Google) Code Review Nov 25, 2022

Merge changes I5ad71fb0,I0756816a

* changes:
  Move SpaEnvironmentForTest for tests.testutils
  Move EntryHighlight to framework/util

parents 9717f312 84168102

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/util/EntryHighlight.kt→packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/EntryHighlight.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.settingslib.spa.widget.util
		package com.android.settingslib.spa.framework.util

		import androidx.compose.animation.animateColorAsState
		import androidx.compose.animation.core.RepeatMode

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/MainSwitchPreference.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import com.android.settingslib.spa.framework.compose.toState
		import com.android.settingslib.spa.framework.theme.SettingsDimension
		import com.android.settingslib.spa.framework.theme.SettingsShape
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.widget.util.EntryHighlight
		import com.android.settingslib.spa.framework.util.EntryHighlight

		@Composable
		fun MainSwitchPreference(model: SwitchPreferenceModel) {

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/Preference.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,9 +27,9 @@ import com.android.settingslib.spa.framework.common.EntrySearchData
		import com.android.settingslib.spa.framework.common.EntryStatusData
		import com.android.settingslib.spa.framework.compose.navigator
		import com.android.settingslib.spa.framework.compose.stateOf
		import com.android.settingslib.spa.framework.util.EntryHighlight
		import com.android.settingslib.spa.framework.util.wrapOnClickWithLog
		import com.android.settingslib.spa.widget.ui.createSettingsIcon
		import com.android.settingslib.spa.widget.util.EntryHighlight

		data class SimplePreferenceMacro(
		val title: String,

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/SliderPreference.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.vector.ImageVector
		import androidx.compose.ui.tooling.preview.Preview
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.framework.util.EntryHighlight
		import com.android.settingslib.spa.widget.ui.SettingsSlider
		import com.android.settingslib.spa.widget.util.EntryHighlight

		/**
		* The widget model for [SliderPreference] widget.

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/SwitchPreference.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,9 +31,9 @@ import com.android.settingslib.spa.framework.compose.stateOf
		import com.android.settingslib.spa.framework.compose.toState
		import com.android.settingslib.spa.framework.theme.SettingsDimension
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.framework.util.EntryHighlight
		import com.android.settingslib.spa.framework.util.wrapOnSwitchWithLog
		import com.android.settingslib.spa.widget.ui.SettingsSwitch
		import com.android.settingslib.spa.widget.util.EntryHighlight

		/**
		* The widget model for [SwitchPreference] widget.