Revert "[PK settings] Remove metrics."
1. This reverts commit bdf89255a0
.
2. Modify ACTION_USE_SPECIFIC_KEYBOARD to log vendor and product id.
Reason for revert: <Add metrics>
Test: atest
Change-Id: I187b990eec7dd0c0009f6c695f595d95420cb4ab
This commit is contained in:
committed by
danielwbhuang
parent
7b6440649e
commit
6b9d8c530f
@@ -56,6 +56,9 @@ import java.util.List;
|
||||
})
|
||||
public class KeyboardSettingsPreferenceControllerTest {
|
||||
|
||||
private static final int VENDOR_ID = 123;
|
||||
private static final int PRODUCT_ID = 456;
|
||||
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
|
||||
@@ -88,7 +91,9 @@ public class KeyboardSettingsPreferenceControllerTest {
|
||||
"TEST_DEVICE",
|
||||
mInputDeviceIdentifier,
|
||||
"TEST_DEVICE_LABEL",
|
||||
address);
|
||||
address,
|
||||
VENDOR_ID,
|
||||
PRODUCT_ID);
|
||||
List<HardKeyboardDeviceInfo> keyboards = new ArrayList<>();
|
||||
keyboards.add(deviceInfo);
|
||||
when(mController.getHardKeyboardList()).thenReturn(keyboards);
|
||||
|
@@ -52,6 +52,8 @@ public class PhysicalKeyboardPreferenceControllerTest {
|
||||
private static final String DEVICE_NAME = "deviceName";
|
||||
private static final String LAYOUT_LABEL = "deviceLayutLabel";
|
||||
private static final String BLUETOOTHADDRESS = "deviceBluetoothAddress";
|
||||
private static final int VENDOR_ID = 123;
|
||||
private static final int PRODUCT_ID = 456;
|
||||
|
||||
@Mock
|
||||
private Context mContext;
|
||||
@@ -84,7 +86,9 @@ public class PhysicalKeyboardPreferenceControllerTest {
|
||||
DEVICE_NAME,
|
||||
mIdentifier,
|
||||
LAYOUT_LABEL,
|
||||
BLUETOOTHADDRESS));
|
||||
BLUETOOTHADDRESS,
|
||||
VENDOR_ID,
|
||||
PRODUCT_ID));
|
||||
mController = spy(new PhysicalKeyboardPreferenceController(context, null));
|
||||
when(mController.getKeyboards()).thenReturn(keyboards);
|
||||
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
@@ -26,10 +31,14 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@@ -39,16 +48,20 @@ import org.robolectric.annotation.Config;
|
||||
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||
})
|
||||
public class TrackpadBottomPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "trackpad_bottom_right_tap";
|
||||
private static final String SETTING_KEY = Settings.System.TOUCHPAD_RIGHT_CLICK_ZONE;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadBottomPreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadBottomPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -74,6 +87,10 @@ public class TrackpadBottomPreferenceControllerTest {
|
||||
UserHandle.USER_CURRENT);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_BOTTOM_RIGHT_TAP_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -87,6 +104,10 @@ public class TrackpadBottomPreferenceControllerTest {
|
||||
UserHandle.USER_CURRENT);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_BOTTOM_RIGHT_TAP_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
@@ -25,25 +30,33 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link TrackpadGoBackPreferenceController} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class TrackpadGoBackPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "gesture_go_back";
|
||||
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_BACK_ENABLED;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadGoBackPreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadGoBackPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -65,6 +78,10 @@ public class TrackpadGoBackPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_GO_BACK_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -74,6 +91,10 @@ public class TrackpadGoBackPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_GO_BACK_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
@@ -25,25 +30,33 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link TrackpadGoHomePreferenceController} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class TrackpadGoHomePreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "gesture_go_home";
|
||||
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_HOME_ENABLED;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadGoHomePreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadGoHomePreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -65,6 +78,10 @@ public class TrackpadGoHomePreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_GO_HOME_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -74,6 +91,10 @@ public class TrackpadGoHomePreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_GO_HOME_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
@@ -25,25 +30,33 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link TrackpadNotificationsPreferenceController} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class TrackpadNotificationsPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "gesture_notifications";
|
||||
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_NOTIFICATION_ENABLED;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadNotificationsPreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadNotificationsPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -65,6 +78,10 @@ public class TrackpadNotificationsPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_NOTIFICATION_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -74,6 +91,10 @@ public class TrackpadNotificationsPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_NOTIFICATION_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.hardware.input.InputSettings;
|
||||
import android.os.UserHandle;
|
||||
@@ -26,10 +31,14 @@ import android.provider.Settings;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@@ -39,6 +48,8 @@ import org.robolectric.annotation.Config;
|
||||
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||
})
|
||||
public class TrackpadPointerSpeedPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "trackpad_pointer_speed";
|
||||
private static final String SETTING_KEY = Settings.System.TOUCHPAD_POINTER_SPEED;
|
||||
@@ -46,10 +57,12 @@ public class TrackpadPointerSpeedPreferenceControllerTest {
|
||||
private Context mContext;
|
||||
private TrackpadPointerSpeedPreferenceController mController;
|
||||
private int mDefaultSpeed;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadPointerSpeedPreferenceController(mContext, PREFERENCE_KEY);
|
||||
mDefaultSpeed = Settings.System.getIntForUser(
|
||||
mContext.getContentResolver(),
|
||||
@@ -89,6 +102,10 @@ public class TrackpadPointerSpeedPreferenceControllerTest {
|
||||
|
||||
assertThat(result).isTrue();
|
||||
assertThat(mController.getSliderPosition()).isEqualTo(inputSpeed);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_POINTER_SPEED_CHANGED),
|
||||
eq(1));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
@@ -25,25 +30,33 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link TrackpadRecentAppsPreferenceController} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class TrackpadRecentAppsPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "gesture_recent_apps";
|
||||
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_OVERVIEW_ENABLED;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadRecentAppsPreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadRecentAppsPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -65,6 +78,10 @@ public class TrackpadRecentAppsPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_RECENT_APPS_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -74,6 +91,10 @@ public class TrackpadRecentAppsPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_RECENT_APPS_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
@@ -26,10 +31,14 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@@ -39,16 +48,20 @@ import org.robolectric.annotation.Config;
|
||||
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||
})
|
||||
public class TrackpadReverseScrollingPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "trackpad_reverse_scrolling";
|
||||
private static final String SETTING_KEY = Settings.System.TOUCHPAD_NATURAL_SCROLLING;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadReverseScrollingPreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadReverseScrollingPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -74,6 +87,10 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
|
||||
UserHandle.USER_CURRENT);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_REVERSE_SCROLLING_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -87,6 +104,10 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
|
||||
UserHandle.USER_CURRENT);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_REVERSE_SCROLLING_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
@@ -25,25 +30,33 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link TrackpadSwitchAppsPreferenceController} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class TrackpadSwitchAppsPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "gesture_switch_apps";
|
||||
private static final String SETTING_KEY = Settings.Secure.TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadSwitchAppsPreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadSwitchAppsPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -65,6 +78,10 @@ public class TrackpadSwitchAppsPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_SWITCH_APPS_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -74,6 +91,10 @@ public class TrackpadSwitchAppsPreferenceControllerTest {
|
||||
int result = Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_SWITCH_APPS_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -18,6 +18,11 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
@@ -26,10 +31,14 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@@ -39,16 +48,20 @@ import org.robolectric.annotation.Config;
|
||||
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
|
||||
})
|
||||
public class TrackpadTapToClickPreferenceControllerTest {
|
||||
@Rule
|
||||
public MockitoRule rule = MockitoJUnit.rule();
|
||||
|
||||
private static final String PREFERENCE_KEY = "trackpad_tap_to_click";
|
||||
private static final String SETTING_KEY = Settings.System.TOUCHPAD_TAP_TO_CLICK;
|
||||
|
||||
private Context mContext;
|
||||
private TrackpadTapToClickPreferenceController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mController = new TrackpadTapToClickPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@@ -74,6 +87,10 @@ public class TrackpadTapToClickPreferenceControllerTest {
|
||||
UserHandle.USER_CURRENT);
|
||||
|
||||
assertThat(result).isEqualTo(1);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_TAP_TO_CLICK_CHANGED),
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -87,6 +104,10 @@ public class TrackpadTapToClickPreferenceControllerTest {
|
||||
UserHandle.USER_CURRENT);
|
||||
|
||||
assertThat(result).isEqualTo(0);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(
|
||||
any(),
|
||||
eq(SettingsEnums.ACTION_GESTURE_TAP_TO_CLICK_CHANGED),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Reference in New Issue
Block a user