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

Merge "Toast warning message when non-admin user tries to open dev options." into main

Browse Source
This commit is contained in:
Nikhil Kumar
2024-01-12 10:43:32 +00:00
committed by Android (Google) Code Review
parent 07ea6d6e21 1a115d3ea0
commit 87f5264823
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -41,9 +41,13 @@
<!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
<string name="show_dev_already">No need, you are already a developer.</string>
<!-- [CHAR LIMIT=NONE] Toast message when user attemps to launch developer otions before enabling it. -->
<!-- [CHAR LIMIT=NONE] Toast message when user attempts to launch developer options before enabling it. -->
<string name="dev_settings_disabled_warning">Please enable developer options first.</string>
<!-- [CHAR LIMIT=NONE] Toast message when non-admin user attempts to launch developer options. -->
<string name="dev_settings_available_to_admin_only_warning">Only the admin users can access developer settings.</string>
<!-- Category headings in left-pane header menu --> <skip />
<!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
<string name="header_category_system">System</string>

9
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -233,7 +233,14 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
return;
}
Context context = requireContext();
if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)) {
UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
if (!um.isAdminUser()) {
Toast.makeText(context, R.string.dev_settings_available_to_admin_only_warning,
Toast.LENGTH_SHORT)
.show();
finish();
} else if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)) {
Toast.makeText(context, R.string.dev_settings_disabled_warning, Toast.LENGTH_SHORT)
.show();
finish();