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

Commit 66f86d46 authored Jan 08, 2025 by Treehugger Robot Committed by Android (Google) Code Review Jan 08, 2025

Merge "[Catalyst] Move PreferenceCoordinate" into main

parents 10265d8d a29db330

src/com/android/settings/service/PreferenceServiceRequestTransformer.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.service.settings.preferences.SetValueRequest
		import android.service.settings.preferences.SetValueResult
		import android.service.settings.preferences.SettingsPreferenceMetadata
		import android.service.settings.preferences.SettingsPreferenceValue
		import com.android.settingslib.graph.PreferenceCoordinate
		import com.android.settingslib.graph.PreferenceGetterErrorCode
		import com.android.settingslib.graph.PreferenceGetterFlags
		import com.android.settingslib.graph.PreferenceGetterRequest
		@@ -40,6 +39,7 @@ import com.android.settingslib.graph.proto.PreferenceOrGroupProto
		import com.android.settingslib.graph.proto.PreferenceProto
		import com.android.settingslib.graph.proto.PreferenceValueProto
		import com.android.settingslib.graph.toIntent
		import com.android.settingslib.metadata.PreferenceCoordinate
		import com.android.settingslib.metadata.SensitivityLevel

		/** Transform Catalyst Graph result to Framework GET METADATA result */

tests/robotests/src/com/android/settings/service/PreferenceServiceRequestTransformerTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.settings.homepage.SettingsHomepageActivity
		import com.android.settingslib.datastore.Permissions
		import com.android.settingslib.flags.Flags.FLAG_SETTINGS_CATALYST
		import com.android.settingslib.graph.PreferenceCoordinate
		import com.android.settingslib.graph.PreferenceGetterErrorCode
		import com.android.settingslib.graph.PreferenceGetterFlags
		import com.android.settingslib.graph.PreferenceGetterResponse
		@@ -48,6 +47,7 @@ import com.android.settingslib.graph.proto.PreferenceGraphProto
		import com.android.settingslib.graph.rangeValueProto
		import com.android.settingslib.graph.textProto
		import com.android.settingslib.graph.toProto
		import com.android.settingslib.metadata.PreferenceCoordinate
		import com.android.settingslib.metadata.SensitivityLevel
		import com.google.common.truth.Truth.assertThat
		import org.junit.Rule