Developer option for Grammatical Gender
Bug: b/272626712 Test: Added and verified affected atests pass Change-Id: Ie07f80d608b78dfce3309533ac02d9a907e5e7b4
This commit is contained in:
@@ -12220,4 +12220,9 @@
|
|||||||
|
|
||||||
<!-- Warning text about the visibility of device name. [CHAR LIMIT=NONE] -->
|
<!-- Warning text about the visibility of device name. [CHAR LIMIT=NONE] -->
|
||||||
<string name="about_phone_device_name_warning">Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>
|
<string name="about_phone_device_name_warning">Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>
|
||||||
|
|
||||||
|
<!-- Developer settings: grammatical gender title [CHAR LIMIT=50]-->
|
||||||
|
<string name="grammatical_gender_title">Grammatical gender</string>
|
||||||
|
<!-- Developer settings: select Grammatical gender dialog title [CHAR LIMIT=50]-->
|
||||||
|
<string name="grammatical_gender_dialog_title">Select Grammatical gender</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -146,6 +146,13 @@
|
|||||||
android:key="quick_settings_tiles"
|
android:key="quick_settings_tiles"
|
||||||
android:title="@string/quick_settings_developer_tiles"
|
android:title="@string/quick_settings_developer_tiles"
|
||||||
android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
|
android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
|
||||||
|
|
||||||
|
<ListPreference
|
||||||
|
android:key="grammatical_gender"
|
||||||
|
android:title="@string/grammatical_gender_title"
|
||||||
|
android:dialogTitle="@string/grammatical_gender_dialog_title"
|
||||||
|
android:entries="@array/grammatical_gender_entries"
|
||||||
|
android:entryValues="@array/grammatical_gender_values" />
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
@@ -744,6 +744,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new ContrastPreferenceController(
|
controllers.add(new ContrastPreferenceController(
|
||||||
context, context.getSystemService(UiModeManager.class)));
|
context, context.getSystemService(UiModeManager.class)));
|
||||||
controllers.add(new ForceEnableNotesRolePreferenceController(context));
|
controllers.add(new ForceEnableNotesRolePreferenceController(context));
|
||||||
|
controllers.add(new GrammaticalGenderPreferenceController(context));
|
||||||
|
|
||||||
return controllers;
|
return controllers;
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,97 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import android.app.ActivityManager;
|
||||||
|
import android.app.IActivityManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.res.Configuration;
|
||||||
|
import android.os.RemoteException;
|
||||||
|
import android.os.SystemProperties;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.ListPreference;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preference controller to control Grammatical Gender
|
||||||
|
*/
|
||||||
|
public class GrammaticalGenderPreferenceController extends DeveloperOptionsPreferenceController
|
||||||
|
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
|
||||||
|
|
||||||
|
private static final String GRAMMATICAL_GENDER_KEY =
|
||||||
|
"grammatical_gender";
|
||||||
|
@VisibleForTesting
|
||||||
|
static final String GRAMMATICAL_GENDER_PROPERTY = "persist.sys.grammatical_gender";
|
||||||
|
private final String[] mListValues;
|
||||||
|
private final String[] mListSummaries;
|
||||||
|
|
||||||
|
private IActivityManager mActivityManager;
|
||||||
|
|
||||||
|
public GrammaticalGenderPreferenceController(Context context) {
|
||||||
|
this(context, ActivityManager.getService());
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
GrammaticalGenderPreferenceController(Context context,
|
||||||
|
IActivityManager activityManager) {
|
||||||
|
super(context);
|
||||||
|
|
||||||
|
mListValues = context.getResources().getStringArray(R.array.grammatical_gender_values);
|
||||||
|
mListSummaries = context.getResources().getStringArray(R.array.grammatical_gender_entries);
|
||||||
|
mActivityManager = activityManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return GRAMMATICAL_GENDER_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
SystemProperties.set(GRAMMATICAL_GENDER_PROPERTY, newValue.toString());
|
||||||
|
updateState(mPreference);
|
||||||
|
try {
|
||||||
|
Configuration config = mActivityManager.getConfiguration();
|
||||||
|
config.setGrammaticalGender(Integer.parseInt(newValue.toString()));
|
||||||
|
mActivityManager.updatePersistentConfiguration(config);
|
||||||
|
} catch (RemoteException ex) {
|
||||||
|
// intentional no-op
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
final ListPreference listPreference = (ListPreference) preference;
|
||||||
|
final String currentValue = SystemProperties.get(GRAMMATICAL_GENDER_PROPERTY);
|
||||||
|
int index = 0; // Defaults to Not Selected
|
||||||
|
for (int i = 0; i < mListValues.length; i++) {
|
||||||
|
if (TextUtils.equals(currentValue, mListValues[i])) {
|
||||||
|
index = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
listPreference.setValue(mListValues[index]);
|
||||||
|
listPreference.setSummary(mListSummaries[index]);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,143 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
|
||||||
|
import static com.android.settings.development.GrammaticalGenderPreferenceController.GRAMMATICAL_GENDER_PROPERTY;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.app.IActivityManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.res.Configuration;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.os.RemoteException;
|
||||||
|
import android.os.SystemProperties;
|
||||||
|
|
||||||
|
import androidx.preference.ListPreference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class GrammaticalGenderPreferenceControllerTest {
|
||||||
|
@Mock
|
||||||
|
private ListPreference mPreference;
|
||||||
|
@Mock
|
||||||
|
private PreferenceScreen mPreferenceScreen;
|
||||||
|
@Mock
|
||||||
|
private IActivityManager mActivityManager;
|
||||||
|
private Configuration mConfiguration;
|
||||||
|
private Context mContext;
|
||||||
|
private GrammaticalGenderPreferenceController mController;
|
||||||
|
private String[] mListValues;
|
||||||
|
private String[] mListSummaries;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
final Resources resources = mContext.getResources();
|
||||||
|
mListValues = resources.getStringArray(R.array.grammatical_gender_values);
|
||||||
|
mListSummaries = resources.getStringArray(R.array.grammatical_gender_entries);
|
||||||
|
mConfiguration = new Configuration();
|
||||||
|
mController = new GrammaticalGenderPreferenceController(mContext, mActivityManager);
|
||||||
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
||||||
|
.thenReturn(mPreference);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
doReturn(mConfiguration).when(mActivityManager).getConfiguration();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_setNeuter_shouldEnableNeuter() throws RemoteException {
|
||||||
|
mController.onPreferenceChange(mPreference, mListValues[1]);
|
||||||
|
final String currentValue = SystemProperties.get(GRAMMATICAL_GENDER_PROPERTY);
|
||||||
|
assertThat(currentValue).isEqualTo(mListValues[1]);
|
||||||
|
verify(mActivityManager).updatePersistentConfiguration(mConfiguration);
|
||||||
|
assertThat(mConfiguration.getGrammaticalGender())
|
||||||
|
.isEqualTo(Integer.parseInt(mListValues[1]));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_setNeuter_shouldSetPreferenceToNeuter() {
|
||||||
|
SystemProperties.set(GRAMMATICAL_GENDER_PROPERTY, mListValues[1]);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setValue(mListValues[1]);
|
||||||
|
verify(mPreference).setSummary(mListSummaries[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_setFeminine_shouldEnableFeminine() throws RemoteException {
|
||||||
|
mController.onPreferenceChange(mPreference, mListValues[2]);
|
||||||
|
final String currentValue = SystemProperties.get(GRAMMATICAL_GENDER_PROPERTY);
|
||||||
|
assertThat(currentValue).isEqualTo(mListValues[2]);
|
||||||
|
verify(mActivityManager).updatePersistentConfiguration(mConfiguration);
|
||||||
|
assertThat(mConfiguration.getGrammaticalGender())
|
||||||
|
.isEqualTo(Integer.parseInt(mListValues[2]));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_setFeminine_shouldSetPreferenceToFeminine() {
|
||||||
|
SystemProperties.set(GRAMMATICAL_GENDER_PROPERTY, mListValues[2]);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setValue(mListValues[2]);
|
||||||
|
verify(mPreference).setSummary(mListSummaries[2]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_setMasculine_shouldEnableMasculine() throws RemoteException {
|
||||||
|
mController.onPreferenceChange(mPreference, mListValues[3]);
|
||||||
|
final String currentValue = SystemProperties.get(GRAMMATICAL_GENDER_PROPERTY);
|
||||||
|
assertThat(currentValue).isEqualTo(mListValues[3]);
|
||||||
|
verify(mActivityManager).updatePersistentConfiguration(mConfiguration);
|
||||||
|
assertThat(mConfiguration.getGrammaticalGender())
|
||||||
|
.isEqualTo(Integer.parseInt(mListValues[3]));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_setMasculine_shouldSetPreferenceToMasculine() {
|
||||||
|
SystemProperties.set(GRAMMATICAL_GENDER_PROPERTY, mListValues[3]);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setValue(mListValues[3]);
|
||||||
|
verify(mPreference).setSummary(mListSummaries[3]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_noValueSet_shouldSetDefaultToNotSpecified() {
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setValue(mListValues[0]);
|
||||||
|
verify(mPreference).setSummary(mListSummaries[0]);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user