Vibrate when fingerprint error text is shown

Some users block the screen when enrolling the fingerprint. Vibrate
the phone to prompt the user to look at the screen in case they get
stuck.

Test: cd tests/robotests && mma
Bug: 67664182
Change-Id: I70dc5a5a566f2e764f8109fb2be25ec6d7c48da9
This commit is contained in:
Maurice Lam
2017-10-26 18:34:06 -07:00
parent f60c99af53
commit 4f41dea738
3 changed files with 195 additions and 6 deletions

View File

@@ -0,0 +1,128 @@
/*
* Copyright (C) 2017 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.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
import android.media.AudioAttributes;
import android.os.CancellationSignal;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.testutils.shadow.ShadowVibrator;
import com.android.settings.wrapper.FingerprintManagerWrapper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import java.util.concurrent.TimeUnit;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(
manifest = TestConfig.MANIFEST_PATH,
sdk = Config.NEWEST_SDK,
shadows = {
ShadowUtils.class,
ShadowVibrator.class
})
public class FingerprintEnrollEnrollingTest {
@Mock
private FingerprintManagerWrapper mFingerprintManager;
private FingerprintEnrollEnrolling mActivity;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
ShadowVibrator.addToServiceMap();
mActivity = Robolectric.buildActivity(
FingerprintEnrollEnrolling.class,
new Intent()
// Set the challenge token so the confirm screen will not be shown
.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]))
.setup().get();
}
@After
public void tearDown() {
ShadowUtils.reset();
ShadowVibrator.reset();
}
@Test
public void fingerprintEnrollHelp_shouldShowHelpTextAndVibrate() {
EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
enrollmentCallback.onEnrollmentProgress(123);
enrollmentCallback.onEnrollmentHelp(
FingerprintManager.FINGERPRINT_ERROR_UNABLE_TO_PROCESS,
"test enrollment help");
TextView errorText = mActivity.findViewById(R.id.error_text);
assertThat(errorText.getText()).isEqualTo("test enrollment help");
Robolectric.getForegroundThreadScheduler().advanceBy(2, TimeUnit.MILLISECONDS);
ShadowVibrator shadowVibrator =
Shadow.extract(application.getSystemService(Vibrator.class));
verify(shadowVibrator.delegate).vibrate(
anyInt(),
nullable(String.class),
any(VibrationEffect.class),
nullable(AudioAttributes.class));
}
private EnrollmentCallback verifyAndCaptureEnrollmentCallback() {
ArgumentCaptor<EnrollmentCallback> callbackCaptor =
ArgumentCaptor.forClass(EnrollmentCallback.class);
verify(mFingerprintManager).enroll(
any(byte[].class),
any(CancellationSignal.class),
anyInt(),
anyInt(),
callbackCaptor.capture());
return callbackCaptor.getValue();
}
}

View File

@@ -0,0 +1,56 @@
/*
* Copyright (C) 2017 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.testutils.shadow;
import static org.mockito.Mockito.mock;
import android.content.Context;
import android.media.AudioAttributes;
import android.os.SystemVibrator;
import android.os.VibrationEffect;
import android.os.Vibrator;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.fakes.RoboVibrator;
import org.robolectric.shadows.ShadowContextImpl;
import org.robolectric.util.ReflectionHelpers;
import java.util.Map;
@Implements(SystemVibrator.class)
public class ShadowVibrator {
private static Map<String, String> getSystemServiceMap() {
return ReflectionHelpers.getStaticField(ShadowContextImpl.class, "SYSTEM_SERVICE_MAP");
}
public static void addToServiceMap() {
getSystemServiceMap().put(Context.VIBRATOR_SERVICE, SystemVibrator.class.getName());
}
public static void reset() {
getSystemServiceMap().put(Context.VIBRATOR_SERVICE, RoboVibrator.class.getName());
}
public final Vibrator delegate = mock(Vibrator.class);
@Implementation
public void vibrate(int uid, String opPkg, VibrationEffect vibe, AudioAttributes attributes) {
delegate.vibrate(uid, opPkg, vibe, attributes);
}
}