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

Merge "Use disabled summary when trustagents are disabled" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-04-02 15:35:58 +00:00
committed by Android (Google) Code Review
parent a9f137842a ee6c4bacd8
commit 6c3f348f87
2 changed files with 100 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -216,7 +217,11 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro
trustAgentPreference.setIntent(new Intent(Intent.ACTION_MAIN)
.setComponent(agent.componentName));
trustAgentPreference.setDisabledByAdmin(agent.admin);
if (!trustAgentPreference.isDisabledByAdmin() && !hasSecurity) {
if (trustAgentPreference.isDisabledByAdmin()) {
// Ensure visibility by setting non-empty summary text.
trustAgentPreference.setSummary(TextUtils.firstNotEmpty(agent.summary, " "));
trustAgentPreference.useAdminDisabledSummary(true);
} else if (!trustAgentPreference.isDisabledByAdmin() && !hasSecurity) {
trustAgentPreference.setEnabled(false);
trustAgentPreference.setSummary(R.string.disabled_because_no_backup_security);
}