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

Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318 am: c711d1c39a

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

Change-Id: Icca52680a21a4e5c86edacc1bab137dbca34846d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-18 21:09:15 +00:00
committed by Automerger Merge Worker
parent f3f3179eeb c711d1c39a
commit ab099dfcf6
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
View File

@@ -170,9 +170,10 @@ public class GraphicsDriverEnableAngleAsSystemDriverController
((SwitchPreference) mPreference).setChecked(false);
}
// Regardless of whether ANGLE is enabled, disable the developer option UI
// as long as UI is not enabled via debug property.
if (!isAngleDeveloperOptionEnabled()) {
// Disable the developer option toggle UI if ANGLE is disabled, this means next time the
// debug property needs to be set to true again to enable ANGLE. If ANGLE is enabled, don't
// disable the developer option toggle UI so that it can be turned off easily.
if (!isAngleDeveloperOptionEnabled() && !((SwitchPreference) mPreference).isChecked()) {
mPreference.setEnabled(false);
}
}