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

Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev am: d84516dd28

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352024

Change-Id: I569924849f4a3bafc95cce6c1325f9f10bae8a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-03-25 00:13:20 +00:00
committed by Automerger Merge Worker
parent aca65d49ce d84516dd28
commit ce49123205
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -48,6 +48,7 @@ import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
@@ -443,14 +444,14 @@ public class AppInfoDashboardFragment extends DashboardFragment
};
final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(context)
.setTitle(context.getText(R.string.app_restricted_settings_lockscreen_title));
.setUseDefaultTitle(); // use default title if title is null/empty
if (context.getSystemService(BiometricManager.class).canAuthenticate(
BiometricManager.Authenticators.DEVICE_CREDENTIAL
| BiometricManager.Authenticators.BIOMETRIC_WEAK)
== BiometricManager.BIOMETRIC_SUCCESS) {
builder.setAllowedAuthenticators(BiometricManager.Authenticators.DEVICE_CREDENTIAL
| BiometricManager.Authenticators.BIOMETRIC_WEAK);
final BiometricManager bm = context.getSystemService(BiometricManager.class);
final int authenticators = BiometricManager.Authenticators.DEVICE_CREDENTIAL
| BiometricManager.Authenticators.BIOMETRIC_WEAK;
if (bm.canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS) {
builder.setAllowedAuthenticators(authenticators);
builder.setSubtitle(bm.getStrings(authenticators).getPromptMessage());
}
final BiometricPrompt bp = builder.build();
@@ -481,6 +482,10 @@ public class AppInfoDashboardFragment extends DashboardFragment
getPackageName(),
AppOpsManager.MODE_ALLOWED);
getActivity().invalidateOptionsMenu();
final String toastString = getContext().getString(
R.string.toast_allows_restricted_settings_successfully,
mAppEntry.label);
Toast.makeText(getContext(), toastString, Toast.LENGTH_LONG).show();
});
return true;
}