1. Add missing test cases for DeviceFoldedViewModel, DeviceRotationViewModel, and FingerprintEnrollFindSensorViewModel 2. Move most of init value of ViewModels into getDefaultViewModelCreationExtras 3. Fix FindSfpsFragment lottie because of incorrect rotation value. 4. Feed configuration change into DeviceFoldedViewModel Bug: 260957195 Test: atest CredentialModelTest AutoCredentialViewModelTest DeviceFoldedViewModelTest DeviceRotationViewModelTest FingerprintEnrollFindSensorViewModelTest FingerprintEnrollIntroViewModelTest FingerprintEnrollProgressViewModelTest FingerprintEnrollmentViewModelTest FingerprintEnrollmentActivityTest Change-Id: Ied55a895bc1774af5bdd256eccd806aaaa1680ef
115 lines
3.8 KiB
Java
115 lines
3.8 KiB
Java
/*
|
|
* Copyright (C) 2022 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.biometrics2.ui.viewmodel;
|
|
|
|
import static android.hardware.display.DisplayManager.DisplayListener;
|
|
|
|
import android.app.Application;
|
|
import android.hardware.display.DisplayManager;
|
|
import android.util.Log;
|
|
import android.view.DisplayInfo;
|
|
import android.view.Surface;
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.lifecycle.AndroidViewModel;
|
|
import androidx.lifecycle.LiveData;
|
|
import androidx.lifecycle.MutableLiveData;
|
|
|
|
import com.android.internal.annotations.VisibleForTesting;
|
|
|
|
/**
|
|
* ViewModel explaining the fingerprint sensor location for fingerprint enrollment.
|
|
*/
|
|
public class DeviceRotationViewModel extends AndroidViewModel {
|
|
|
|
private static final boolean DEBUG = false;
|
|
private static final String TAG = "DeviceRotationViewModel";
|
|
|
|
private final DisplayManager mDisplayManager;
|
|
private final boolean mIsReverseDefaultRotation;
|
|
@NonNull private final DisplayInfo mDisplayInfo = new DisplayInfo();
|
|
|
|
/** {@link android.hardware.display.DisplayManager} is a final class, set this member visibility
|
|
* to 'protected' for testing
|
|
*/
|
|
@VisibleForTesting
|
|
protected final DisplayListener mDisplayListener = new DisplayListener() {
|
|
@Override
|
|
public void onDisplayAdded(int displayId) {
|
|
}
|
|
|
|
@Override
|
|
public void onDisplayRemoved(int displayId) {
|
|
}
|
|
|
|
@Override
|
|
public void onDisplayChanged(int displayId) {
|
|
final int rotation = getRotation();
|
|
if (DEBUG) {
|
|
Log.d(TAG, "onDisplayChanged(" + displayId + "), rotation:" + rotation);
|
|
}
|
|
mLiveData.postValue(rotation);
|
|
}
|
|
};
|
|
|
|
@NonNull private final MutableLiveData<Integer> mLiveData = new MutableLiveData<>();
|
|
|
|
public DeviceRotationViewModel(@NonNull Application application) {
|
|
super(application);
|
|
mDisplayManager = application.getSystemService(DisplayManager.class);
|
|
mDisplayManager.registerDisplayListener(mDisplayListener,
|
|
application.getMainThreadHandler());
|
|
mIsReverseDefaultRotation = application.getResources().getBoolean(
|
|
com.android.internal.R.bool.config_reverseDefaultRotation);
|
|
}
|
|
|
|
/**
|
|
* Returns current rotation.
|
|
*
|
|
* {@link android.view.Display} is a final class, set this method visibility to "protected" for
|
|
* inheriting it in test
|
|
*/
|
|
@VisibleForTesting
|
|
@Surface.Rotation
|
|
protected int getRotation() {
|
|
getApplication().getDisplay().getDisplayInfo(mDisplayInfo);
|
|
if (mIsReverseDefaultRotation) {
|
|
return (mDisplayInfo.rotation + 1) % 4;
|
|
} else {
|
|
return mDisplayInfo.rotation;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns RotationLiveData
|
|
*/
|
|
public LiveData<Integer> getLiveData() {
|
|
if (mLiveData.getValue() == null) {
|
|
// Init data here because if we set it through getDisplay().getRotation() or through
|
|
// getDisplay().getDisplayInfo() in constructor(), we always get incorrect value.
|
|
mLiveData.setValue(getRotation());
|
|
}
|
|
return mLiveData;
|
|
}
|
|
|
|
@Override
|
|
protected void onCleared() {
|
|
mDisplayManager.unregisterDisplayListener(mDisplayListener);
|
|
super.onCleared();
|
|
}
|
|
}
|