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

Merge "UI and error message fixes for 16k developer option" into main am: e550896658 am: 588dbe4b31

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

Change-Id: Ie63bca803a77b8f3468e68050898934cc8b9e1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pawan Wagh
2024-05-11 03:50:47 +00:00
committed by Automerger Merge Worker
parent 02e0dc41cf 588dbe4b31
commit 3e4a37adbb
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,6 +384,13 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|| enableAngleController.isDefaultValue())) {
disableDeveloperOptions();
} else {
// Disabling developer options in page-agnostic mode isn't supported as device
// isn't in production state
if (Enable16kUtils.isPageAgnosticModeOn(getContext())) {
Enable16kUtils.showPageAgnosticWarning(getContext());
onDisableDevelopmentOptionsRejected();
return;
}
DisableDevSettingsDialogFragment.show(this /* host */);
}
}