Change Observer's onChanged parameter name to value
Give Observer's onChanged() method parameter `t`
a more descriptive name of `value`.
RelNote: "`Observer` class's `onChanged()` method
now uses the name `value` for its parameter."
Test: ./gradlew checkApi
Bug: 240298691
Change-Id: I4995e88bac1a5dba16a8359f9361886aff013bb0
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CameraStateMachineTest.kt b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CameraStateMachineTest.kt
index b8d9b49..93da10a 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CameraStateMachineTest.kt
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CameraStateMachineTest.kt
@@ -171,9 +171,9 @@
private val states = mutableListOf<CameraState>()
private var index = 0
- override fun onChanged(state: CameraState?) {
- if (state != null) {
- states.add(state)
+ override fun onChanged(value: CameraState?) {
+ if (value != null) {
+ states.add(value)
}
}
diff --git a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/internal/sessionprocessor/BasicExtenderSessionProcessorTest.kt b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/internal/sessionprocessor/BasicExtenderSessionProcessorTest.kt
index fddf7c4..46e04fa 100644
--- a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/internal/sessionprocessor/BasicExtenderSessionProcessorTest.kt
+++ b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/internal/sessionprocessor/BasicExtenderSessionProcessorTest.kt
@@ -299,8 +299,8 @@
val cameraClosedLatch = CountDownLatch(1)
withContext(Dispatchers.Main) {
camera.cameraInfo.cameraState.observeForever(object : Observer<CameraState?> {
- override fun onChanged(cameraState: CameraState?) {
- if (cameraState?.type == CameraState.Type.CLOSED) {
+ override fun onChanged(value: CameraState?) {
+ if (value?.type == CameraState.Type.CLOSED) {
cameraClosedLatch.countDown()
camera.cameraInfo.cameraState.removeObserver(this)
}
diff --git a/lifecycle/lifecycle-livedata-core/api/current.txt b/lifecycle/lifecycle-livedata-core/api/current.txt
index c7c4dd3..f528b4e 100644
--- a/lifecycle/lifecycle-livedata-core/api/current.txt
+++ b/lifecycle/lifecycle-livedata-core/api/current.txt
@@ -26,7 +26,7 @@
}
public fun interface Observer<T> {
- method public void onChanged(T? t);
+ method public void onChanged(T? value);
}
}
diff --git a/lifecycle/lifecycle-livedata-core/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-livedata-core/api/public_plus_experimental_current.txt
index c7c4dd3..f528b4e 100644
--- a/lifecycle/lifecycle-livedata-core/api/public_plus_experimental_current.txt
+++ b/lifecycle/lifecycle-livedata-core/api/public_plus_experimental_current.txt
@@ -26,7 +26,7 @@
}
public fun interface Observer<T> {
- method public void onChanged(T? t);
+ method public void onChanged(T? value);
}
}
diff --git a/lifecycle/lifecycle-livedata-core/api/restricted_current.txt b/lifecycle/lifecycle-livedata-core/api/restricted_current.txt
index c7c4dd3..f528b4e 100644
--- a/lifecycle/lifecycle-livedata-core/api/restricted_current.txt
+++ b/lifecycle/lifecycle-livedata-core/api/restricted_current.txt
@@ -26,7 +26,7 @@
}
public fun interface Observer<T> {
- method public void onChanged(T? t);
+ method public void onChanged(T? value);
}
}
diff --git a/lifecycle/lifecycle-livedata-core/src/main/java/androidx/lifecycle/Observer.kt b/lifecycle/lifecycle-livedata-core/src/main/java/androidx/lifecycle/Observer.kt
index eaf9504..2df6295 100644
--- a/lifecycle/lifecycle-livedata-core/src/main/java/androidx/lifecycle/Observer.kt
+++ b/lifecycle/lifecycle-livedata-core/src/main/java/androidx/lifecycle/Observer.kt
@@ -23,9 +23,7 @@
fun interface Observer<T> {
/**
- * Called when the data is changed.
- *
- * @param t The new data
+ * Called when the data is changed is changed to [value].
*/
- fun onChanged(t: T)
+ fun onChanged(value: T)
}
\ No newline at end of file
diff --git a/lifecycle/lifecycle-livedata-core/src/test/java/androidx/lifecycle/LiveDataTest.java b/lifecycle/lifecycle-livedata-core/src/test/java/androidx/lifecycle/LiveDataTest.java
index 85834a3..874db97 100644
--- a/lifecycle/lifecycle-livedata-core/src/test/java/androidx/lifecycle/LiveDataTest.java
+++ b/lifecycle/lifecycle-livedata-core/src/test/java/androidx/lifecycle/LiveDataTest.java
@@ -954,7 +954,7 @@
private class FailReentranceObserver<T> implements Observer<T> {
@Override
- public void onChanged(@Nullable T t) {
+ public void onChanged(@Nullable T value) {
assertThat(mInObserver, is(false));
}
}
diff --git a/lifecycle/lifecycle-livedata-ktx/src/test/java/androidx/lifecycle/ScopesRule.kt b/lifecycle/lifecycle-livedata-ktx/src/test/java/androidx/lifecycle/ScopesRule.kt
index 7791be2..d1193af 100644
--- a/lifecycle/lifecycle-livedata-ktx/src/test/java/androidx/lifecycle/ScopesRule.kt
+++ b/lifecycle/lifecycle-livedata-ktx/src/test/java/androidx/lifecycle/ScopesRule.kt
@@ -104,8 +104,8 @@
private val scopes: ScopesRule
) : Observer<T> {
private var items = mutableListOf<T>()
- override fun onChanged(t: T) {
- items.add(t)
+ override fun onChanged(value: T) {
+ items.add(value)
}
fun assertItems(vararg expected: T) {
diff --git a/lifecycle/lifecycle-livedata/src/main/java/androidx/lifecycle/Transformations.kt b/lifecycle/lifecycle-livedata/src/main/java/androidx/lifecycle/Transformations.kt
index 7c8af62..26d7c36 100644
--- a/lifecycle/lifecycle-livedata/src/main/java/androidx/lifecycle/Transformations.kt
+++ b/lifecycle/lifecycle-livedata/src/main/java/androidx/lifecycle/Transformations.kt
@@ -120,8 +120,8 @@
result.addSource(this, object : Observer<X> {
var liveData: LiveData<Y>? = null
- override fun onChanged(x: X) {
- val newLiveData = transform(x)
+ override fun onChanged(value: X) {
+ val newLiveData = transform(value)
if (liveData === newLiveData) {
return
}
@@ -149,8 +149,8 @@
result.addSource(this, object : Observer<X> {
var liveData: LiveData<Y>? = null
- override fun onChanged(x: X) {
- val newLiveData = switchMapFunction.apply(x)
+ override fun onChanged(value: X) {
+ val newLiveData = switchMapFunction.apply(value)
if (liveData === newLiveData) {
return
}
@@ -180,14 +180,14 @@
outputLiveData.addSource(this, object : Observer<X> {
var firstTime = true
- override fun onChanged(currentValue: X) {
+ override fun onChanged(value: X) {
val previousValue = outputLiveData.value
if (firstTime ||
- previousValue == null && currentValue != null ||
- previousValue != null && previousValue != currentValue
+ previousValue == null && value != null ||
+ previousValue != null && previousValue != value
) {
firstTime = false
- outputLiveData.value = currentValue
+ outputLiveData.value = value
}
}
})
diff --git a/lifecycle/lifecycle-livedata/src/test/java/androidx/lifecycle/TransformationsTest.java b/lifecycle/lifecycle-livedata/src/test/java/androidx/lifecycle/TransformationsTest.java
index e77c136..4b1a493 100644
--- a/lifecycle/lifecycle-livedata/src/test/java/androidx/lifecycle/TransformationsTest.java
+++ b/lifecycle/lifecycle-livedata/src/test/java/androidx/lifecycle/TransformationsTest.java
@@ -238,7 +238,7 @@
int mTimesUpdated;
@Override
- public void onChanged(@Nullable T t) {
+ public void onChanged(@Nullable T value) {
++mTimesUpdated;
}
}
diff --git a/lifecycle/lifecycle-reactivestreams/src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt b/lifecycle/lifecycle-reactivestreams/src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt
index dbf4021..41efe65 100644
--- a/lifecycle/lifecycle-reactivestreams/src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt
+++ b/lifecycle/lifecycle-reactivestreams/src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt
@@ -86,18 +86,18 @@
// used on main thread only
var latest: T? = null
- override fun onChanged(t: T?) {
+ override fun onChanged(value: T?) {
if (canceled) {
return
}
if (requested > 0) {
latest = null
- subscriber.onNext(t)
+ subscriber.onNext(value)
if (requested != Long.MAX_VALUE) {
requested--
}
} else {
- latest = t
+ latest = value
}
}
diff --git a/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/ui/DefaultProgressFragmentTest.kt b/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/ui/DefaultProgressFragmentTest.kt
index 57d781b..99c67e7 100644
--- a/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/ui/DefaultProgressFragmentTest.kt
+++ b/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/ui/DefaultProgressFragmentTest.kt
@@ -72,8 +72,8 @@
// it to fail before we check for test failure.
val liveData = viewModel.installMonitor!!.status
val observer = object : Observer<SplitInstallSessionState> {
- override fun onChanged(state: SplitInstallSessionState) {
- if (state.status() == SplitInstallSessionStatus.FAILED) {
+ override fun onChanged(value: SplitInstallSessionState) {
+ if (value.status() == SplitInstallSessionStatus.FAILED) {
liveData.removeObserver(this)
failureCountdownLatch.countDown()
}
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataTestUtil.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataTestUtil.kt
index aabc29a..4c8a2f8 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataTestUtil.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataTestUtil.kt
@@ -29,8 +29,8 @@
val latch = CountDownLatch(1)
var data: T? = null
val observer = object : Observer<T> {
- override fun onChanged(o: T?) {
- data = o
+ override fun onChanged(value: T?) {
+ data = value
liveData.removeObserver(this)
latch.countDown()
}
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/TestObserver.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/TestObserver.kt
index c3005bf..243c4df 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/TestObserver.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/TestObserver.kt
@@ -27,8 +27,8 @@
mLastData = null
}
- override fun onChanged(o: T?) {
- mLastData = o
+ override fun onChanged(value: T?) {
+ mLastData = value
mHasValue = true
}
diff --git a/work/work-inspection/src/main/java/androidx/work/inspection/WorkManagerInspector.kt b/work/work-inspection/src/main/java/androidx/work/inspection/WorkManagerInspector.kt
index 66a0dd2..f51e4cf 100644
--- a/work/work-inspection/src/main/java/androidx/work/inspection/WorkManagerInspector.kt
+++ b/work/work-inspection/src/main/java/androidx/work/inspection/WorkManagerInspector.kt
@@ -133,13 +133,13 @@
owner,
object : Observer<T> {
private var lastValue: T? = null
- override fun onChanged(t: T) {
- if (t == null) {
+ override fun onChanged(value: T) {
+ if (value == null) {
removeObserver(this)
} else {
executor.execute {
- listener(lastValue, t)
- lastValue = t
+ listener(lastValue, value)
+ lastValue = value
}
}
}
diff --git a/work/work-runtime/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java b/work/work-runtime/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java
index bd21bae..c186329 100644
--- a/work/work-runtime/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java
+++ b/work/work-runtime/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java
@@ -124,7 +124,7 @@
int mTimesUpdated;
@Override
- public void onChanged(@Nullable T t) {
+ public void onChanged(@Nullable T value) {
++mTimesUpdated;
}
}
