PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass Timeout back to upper biometric preference

Browse Source 
When FaceSettings or FingerprintSettings are closed because of onStop(),
this information can't been passed back to previous Preference screen,
CombinedBiometricSettings, because handlePreferenceTreeClick() from
AbstractPreferenceController class only can launchActivity() throguh
preference's Context.

In order to recevice the activity result code from FaceSettings or
FingerprintSettings, add handleBiometricPreferenceTreeClick() method in
BiometricStatusPreferenceController. Then CombinedBiometricSettings uses
this method to show FaceSettings or FingerprintSettings through
launchActivityForResult().

Bug: 263057093
Test: atest BiometricNavigationUtilsTest
Test: Manually open camera through double-click power key on different
      pages inside "Face & Fingerprint Unlock"
Change-Id: I99167739766ad5ea5f204b0f0543ba6ad18fac31
This commit is contained in:
Milton Wu
2023-03-31 19:49:46 +08:00
parent 2c427629d8
commit 52a46d0a85
6 changed files with 130 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/biometrics/BiometricNavigationUtils.java
View File

@@ -26,6 +26,9 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.Nullable;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settingslib.RestrictedLockUtils;
@@ -49,15 +52,23 @@ public class BiometricNavigationUtils {
*
* @param className The class name of Settings screen to launch.
* @param extras Extras to put into the launching {@link Intent}.
* @param launcher Launcher to launch activity if non-quiet mode
* @return true if the Settings screen is launching.
*/
public boolean launchBiometricSettings(Context context, String className, Bundle extras) {
public boolean launchBiometricSettings(Context context, String className, Bundle extras,
@Nullable ActivityResultLauncher<Intent> launcher) {
final Intent quietModeDialogIntent = getQuietModeDialogIntent(context);
if (quietModeDialogIntent != null) {
context.startActivity(quietModeDialogIntent);
return false;
}
context.startActivity(getSettingsPageIntent(className, extras));
final Intent settingsPageIntent = getSettingsPageIntent(className, extras);
if (launcher != null) {
launcher.launch(settingsPageIntent);
} else {
context.startActivity(settingsPageIntent);
}
return true;
}