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

Merge "Don't overwrite the system global gender settings" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-10 18:45:07 +00:00
committed by Android (Google) Code Review
parent fd0dd5dfdd 67466de364
commit 619af9349d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,12 +69,19 @@ public class GrammaticalGenderPreferenceController extends DeveloperOptionsPrefe
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
final var oldValue = SystemProperties.getInt(GRAMMATICAL_GENDER_PROPERTY,
Configuration.GRAMMATICAL_GENDER_NOT_SPECIFIED);
SystemProperties.set(GRAMMATICAL_GENDER_PROPERTY, newValue.toString()); SystemProperties.set(GRAMMATICAL_GENDER_PROPERTY, newValue.toString());
updateState(mPreference); updateState(mPreference);
try { try {
Configuration config = mActivityManager.getConfiguration(); Configuration config = mActivityManager.getConfiguration();
// Only apply the developer settings value if it is the one currently used,
// otherwise it means there's some kind of override that we don't want to
// touch here.
if (config.getGrammaticalGender() == oldValue) {
config.setGrammaticalGender(Integer.parseInt(newValue.toString())); config.setGrammaticalGender(Integer.parseInt(newValue.toString()));
mActivityManager.updatePersistentConfiguration(config); mActivityManager.updatePersistentConfiguration(config);
}
} catch (RemoteException ex) { } catch (RemoteException ex) {
// intentional no-op // intentional no-op
} }