Log metrics for pointer icon settings changes.
Bug: 269100659 Test: PointerFillStylePreferenceControllerTest Test: PointerStrokeStylePreferenceControllerTest Test: PointerScaleSeekBarControllerTest Flag: android.view.flags.enable_vector_cursor_a11y_settings Change-Id: I5966abff27122269e59f20e63bd708b9739f4875
This commit is contained in:
@@ -0,0 +1,113 @@
|
||||
/*
|
||||
* Copyright 2024 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.inputmethod;
|
||||
|
||||
import static android.view.flags.Flags.enableVectorCursorA11ySettings;
|
||||
|
||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
import static com.android.settings.inputmethod.PointerFillStylePreferenceController.KEY_POINTER_FILL_STYLE;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assume.assumeTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.Lifecycle;
|
||||
import androidx.lifecycle.LifecycleEventObserver;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.ShadowSystemSettings;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
/** Tests for {@link PointerFillStylePreferenceController} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = {
|
||||
ShadowSystemSettings.class,
|
||||
})
|
||||
public class PointerFillStylePreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
|
||||
@Mock
|
||||
PreferenceScreen mPreferenceScreen;
|
||||
@Mock
|
||||
LifecycleOwner mLifecycleOwner;
|
||||
|
||||
private Context mContext;
|
||||
private PointerFillStylePreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new PointerFillStylePreferenceController(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_initializeDataStore() {
|
||||
Preference fillPreference = new Preference(mContext);
|
||||
fillPreference.setKey(KEY_POINTER_FILL_STYLE);
|
||||
when(mPreferenceScreen.findPreference(eq(KEY_POINTER_FILL_STYLE))).thenReturn(
|
||||
fillPreference);
|
||||
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
|
||||
assertNotNull(fillPreference.getPreferenceDataStore());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_flagEnabled() {
|
||||
assumeTrue(enableVectorCursorA11ySettings());
|
||||
|
||||
assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPause_logCurrentFillValue() {
|
||||
int fillStyle = 1;
|
||||
Settings.System.putIntForUser(mContext.getContentResolver(),
|
||||
Settings.System.POINTER_FILL_STYLE, fillStyle, UserHandle.USER_CURRENT);
|
||||
|
||||
mController.onStateChanged(mLifecycleOwner, Lifecycle.Event.ON_PAUSE);
|
||||
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(), eq(SettingsEnums.ACTION_POINTER_ICON_FILL_STYLE_CHANGED),
|
||||
eq(fillStyle));
|
||||
}
|
||||
}
|
@@ -22,16 +22,24 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assume.assumeTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
import android.widget.SeekBar;
|
||||
|
||||
import androidx.lifecycle.Lifecycle;
|
||||
import androidx.lifecycle.LifecycleEventObserver;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.ShadowSystemSettings;
|
||||
import com.android.settings.widget.LabeledSeekBarPreference;
|
||||
|
||||
@@ -58,14 +66,17 @@ public class PointerScaleSeekBarControllerTest {
|
||||
@Rule public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
|
||||
@Mock private PreferenceScreen mPreferenceScreen;
|
||||
@Mock private LifecycleOwner mLifecycleOwner;
|
||||
|
||||
private Context mContext;
|
||||
private LabeledSeekBarPreference mPreference;
|
||||
private PointerScaleSeekBarController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mPreference = new LabeledSeekBarPreference(mContext, null);
|
||||
mController = new PointerScaleSeekBarController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
@@ -91,4 +102,17 @@ public class PointerScaleSeekBarControllerTest {
|
||||
Settings.System.POINTER_SCALE, -1, UserHandle.USER_CURRENT);
|
||||
assertEquals(expectedScale, currentScale, /* delta= */ 0.001f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPause_logCurrentScaleValue() {
|
||||
float scale = 1.5f;
|
||||
Settings.System.putFloatForUser(mContext.getContentResolver(),
|
||||
Settings.System.POINTER_SCALE, scale, UserHandle.USER_CURRENT);
|
||||
|
||||
mController.onStateChanged(mLifecycleOwner, Lifecycle.Event.ON_PAUSE);
|
||||
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(), eq(SettingsEnums.ACTION_POINTER_ICON_SCALE_CHANGED),
|
||||
eq(Float.toString(scale)));
|
||||
}
|
||||
}
|
||||
|
@@ -24,15 +24,26 @@ import static com.android.settings.inputmethod.PointerStrokeStylePreferenceContr
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assume.assumeTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.Lifecycle;
|
||||
import androidx.lifecycle.LifecycleEventObserver;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.ShadowSystemSettings;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
@@ -41,22 +52,30 @@ import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
/** Tests for {@link PointerStrokeStylePreferenceController} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = {
|
||||
ShadowSystemSettings.class,
|
||||
})
|
||||
public class PointerStrokeStylePreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
|
||||
@Mock
|
||||
PreferenceScreen mPreferenceScreen;
|
||||
@Mock
|
||||
LifecycleOwner mLifecycleOwner;
|
||||
|
||||
private Context mContext;
|
||||
private PointerStrokeStylePreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new PointerStrokeStylePreferenceController(mContext);
|
||||
}
|
||||
|
||||
@@ -78,4 +97,17 @@ public class PointerStrokeStylePreferenceControllerTest {
|
||||
|
||||
assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPause_logCurrentStrokeValue() {
|
||||
int strokeStyle = 1;
|
||||
Settings.System.putIntForUser(mContext.getContentResolver(),
|
||||
Settings.System.POINTER_STROKE_STYLE, strokeStyle, UserHandle.USER_CURRENT);
|
||||
|
||||
mController.onStateChanged(mLifecycleOwner, Lifecycle.Event.ON_PAUSE);
|
||||
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(), eq(SettingsEnums.ACTION_POINTER_ICON_STROKE_STYLE_CHANGED),
|
||||
eq(strokeStyle));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user