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

[Regional Preference] Create each page for regional preferences

Browse Source 
- Temperature unit
 - Calendar type
 - First day of week

Bug: b/246929960
Bug: b/247072550
Bug: b/247071792
Bug: b/247071572
Test: atest passed
Test: Manual test passed

Change-Id: Iea093588da33b352b5e7bfa5c483659e7afb8296
This commit is contained in:
tom hsu
2022-12-28 16:15:56 +08:00
parent 77522a55b6
commit 278f2b07f4
17 changed files with 876 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/unit/src/com/android/settings/regionalpreferences/CalendarTypeControllerTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.regionalpreferences;
import static org.junit.Assert.assertEquals;
import android.content.Context;
import android.icu.util.ULocale;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
@@ -48,49 +49,57 @@ public class CalendarTypeControllerTest {
@After
public void tearDown() throws Exception {
RegionalPreferenceUtils.setSettingsProviderContent(
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, mCacheProviderContent);
Locale.setDefault(mCacheLocale);
}
@Test
public void getSummary_hasProviderValue_resultIsChinese() {
RegionalPreferenceUtils.setSettingsProviderContent(
public void getSummary_hasProviderValue_resultIsChineseCalendar() {
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, "und-u-ca-chinese");
CharSequence type = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.CalendarType.CHINESE, type.toString());
assertEquals(getDisplayKeywordValue(LocalePreferences.CalendarType.CHINESE), summary);
}
@Test
public void getSummary_hasProviderValue_resultIsDangi() {
RegionalPreferenceUtils.setSettingsProviderContent(
public void getSummary_hasProviderValue_resultIsDangiCalendar() {
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, "und-u-ca-dangi");
CharSequence type = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.CalendarType.DANGI, type.toString());
assertEquals(getDisplayKeywordValue(LocalePreferences.CalendarType.DANGI), summary);
}
@Test
public void getSummary_noProviderValueButHasDefaultLocaleWithSubtag_resultIsSat() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "");
public void getSummary_noProviderValueButHasDefaultLocaleWithSubtag_resultIsChineseCalendar() {
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
Locale.setDefault(Locale.forLanguageTag("en-US-u-ca-chinese"));
CharSequence type = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.CalendarType.CHINESE, type.toString());
assertEquals(getDisplayKeywordValue(LocalePreferences.CalendarType.CHINESE), summary);
}
@Test
public void getSummary_noProviderValueAndDefaultLocaleWithoutSubtag_resultIsEmpty() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "");
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
Locale.setDefault(Locale.forLanguageTag("en-US"));
CharSequence type = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "default_string_of_regional_preference"), type.toString());
mApplicationContext, "default_string_of_regional_preference"), summary);
}
private static String getDisplayKeywordValue(String value) {
String languageTag = new Locale.Builder()
.setUnicodeLocaleKeyword(
RegionalPreferencesFragment.TYPE_CALENDAR, value).build().toLanguageTag();
return ULocale.getDisplayKeywordValue(languageTag, "calendar",
ULocale.forLocale(Locale.getDefault(Locale.Category.FORMAT)));
}
}

31
tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekControllerTest.java
View File

@@ -48,47 +48,50 @@ public class FirstDayOfWeekControllerTest {
@After
public void tearDown() throws Exception {
RegionalPreferenceUtils.setSettingsProviderContent(
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, mCacheProviderContent);
Locale.setDefault(mCacheLocale);
}
@Test
public void getSummary_hasProviderValue_resultIsWed() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "und-u-fw-wed");
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "und-u-fw-wed");
CharSequence day = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.FirstDayOfWeek.WEDNESDAY, day.toString());
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "wednesday_first_day_of_week"), summary);
}
@Test
public void getSummary_hasProviderValue_resultIsSat() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "und-u-fw-sat");
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "und-u-fw-sat");
CharSequence day = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.FirstDayOfWeek.SATURDAY, day.toString());
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "saturday_first_day_of_week"), summary);
}
@Test
public void getSummary_noProviderValueButHasDefaultLocaleWithSubtag_resultIsSat() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "");
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
Locale.setDefault(Locale.forLanguageTag("en-US-u-fw-sat"));
CharSequence day = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.FirstDayOfWeek.SATURDAY, day.toString());
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "saturday_first_day_of_week"), summary);
}
@Test
public void getSummary_noProviderValueAndDefaultLocaleWithoutSubtag_resultIsEmpty() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "");
public void getSummary_noProviderValueAndDefaultLocaleWithoutSubtag_resultIsdefault() {
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
Locale.setDefault(Locale.forLanguageTag("en-US"));
CharSequence day = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "default_string_of_regional_preference"), day.toString());
mApplicationContext, "default_string_of_regional_preference"), summary);
}
}

2
tests/unit/src/com/android/settings/regionalpreferences/RegionalPreferenceUtils.java → tests/unit/src/com/android/settings/regionalpreferences/RegionalPreferenceTestUtils.java
View File

@@ -20,7 +20,7 @@ import android.content.Context;
import android.provider.Settings;
/** Utils for each regional preference unit test. */
public final class RegionalPreferenceUtils {
public final class RegionalPreferenceTestUtils {
/** Set language tag to Settings Provider */
public static void setSettingsProviderContent(Context context, String languageTag) {
Settings.System.putString(context.getContentResolver(),

161
tests/unit/src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtilsTest.java Normal file
View File

@@ -0,0 +1,161 @@
/*
* 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.regionalpreferences;
import static org.junit.Assert.assertEquals;
import android.content.Context;
import android.os.LocaleList;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.app.LocalePicker;
import com.android.settings.testutils.ResourcesUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.util.Locale;
public class RegionalPreferencesDataUtilsTest {
private Context mApplicationContext;
private String mCacheProviderContent = "";
private Locale mCacheLocale;
private LocaleList mCacheLocaleList;
@Before
public void setUp() throws Exception {
mApplicationContext = ApplicationProvider.getApplicationContext();
mCacheProviderContent = Settings.System.getString(
mApplicationContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
mCacheLocale = Locale.getDefault(Locale.Category.FORMAT);
mCacheLocaleList = LocaleList.getDefault();
}
@After
public void tearDown() throws Exception {
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, mCacheProviderContent);
Locale.setDefault(mCacheLocale);
LocalePicker.updateLocales(mCacheLocaleList);
}
@Test
public void getDefaultUnicodeExtensionData_hasProviderValue_resultIsCelsius() {
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, "und-u-mu-celsius");
String unit = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(
mApplicationContext, RegionalPreferencesFragment.TYPE_TEMPERATURE);
assertEquals(LocalePreferences.TemperatureUnit.CELSIUS, unit);
}
@Test
public void getDefaultUnicodeExtensionData_hasDefaultLocaleSubtag_resultIsCelsius() {
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, "und");
Locale.setDefault(Locale.forLanguageTag("en-US-u-mu-celsius"));
String unit = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(
mApplicationContext, RegionalPreferencesFragment.TYPE_TEMPERATURE);
assertEquals(LocalePreferences.TemperatureUnit.CELSIUS, unit);
}
@Test
public void getDefaultUnicodeExtensionData_noSubtag_resultIsDefault() {
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, "und");
Locale.setDefault(Locale.forLanguageTag("en-US"));
String unit = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(
mApplicationContext, RegionalPreferencesFragment.TYPE_TEMPERATURE);
assertEquals(RegionalPreferencesFragment.TYPE_DEFAULT, unit);
}
@Test
public void savePreference_saveCalendarIsDangi_success() {
RegionalPreferencesDataUtils.savePreference(
mApplicationContext,
RegionalPreferencesFragment.TYPE_CALENDAR,
LocalePreferences.CalendarType.DANGI
);
String providerContent = Settings.System.getString(
mApplicationContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
Locale locale = Locale.forLanguageTag(providerContent);
String result1 = locale.getUnicodeLocaleType(RegionalPreferencesFragment.TYPE_CALENDAR);
assertEquals(LocalePreferences.CalendarType.DANGI, result1);
String result2 = Locale.getDefault(Locale.Category.FORMAT)
.getUnicodeLocaleType(RegionalPreferencesFragment.TYPE_CALENDAR);
assertEquals(LocalePreferences.CalendarType.DANGI, result2);
}
@Test
public void temperatureUnitsConverter_inputFahrenheit_resultIsFahrenheitString() {
String result = RegionalPreferencesDataUtils.temperatureUnitsConverter(mApplicationContext,
LocalePreferences.TemperatureUnit.FAHRENHEIT);
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "fahrenheit_temperature_unit"), result);
}
@Test
public void temperatureUnitsConverter_inputDefault_resultIsDefaultString() {
String result = RegionalPreferencesDataUtils.temperatureUnitsConverter(mApplicationContext,
RegionalPreferencesFragment.TYPE_DEFAULT);
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "default_string_of_regional_preference"), result);
}
@Test
public void dayConverter_inputWed_resultIsWedString() {
String result = RegionalPreferencesDataUtils.dayConverter(mApplicationContext,
LocalePreferences.FirstDayOfWeek.WEDNESDAY);
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "wednesday_first_day_of_week"), result);
}
@Test
public void dayConverter_inputDefault_resultIsDefaultString() {
String result = RegionalPreferencesDataUtils.dayConverter(mApplicationContext,
RegionalPreferencesFragment.TYPE_DEFAULT);
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "default_string_of_regional_preference"), result);
}
@Test
public void calendarConverter_inputDefault_resultIsDefaultString() {
String result = RegionalPreferencesDataUtils.dayConverter(mApplicationContext,
RegionalPreferencesFragment.TYPE_DEFAULT);
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "default_string_of_regional_preference"), result);
}
}

70
tests/unit/src/com/android/settings/regionalpreferences/RegionalPreferencesFragmentTest.java Normal file
View File

@@ -0,0 +1,70 @@
/*
* 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.regionalpreferences;
import static org.junit.Assert.assertEquals;
import android.app.settings.SettingsEnums;
import android.os.Looper;
import androidx.test.annotation.UiThreadTest;
import org.junit.Before;
import org.junit.Test;
public class RegionalPreferencesFragmentTest {
private RegionalPreferencesFragment mFragment;
@Before
@UiThreadTest
public void setUp() throws Exception {
if (Looper.myLooper() == null) {
Looper.prepare();
}
mFragment = new RegionalPreferencesFragment();
}
@Test
@UiThreadTest
public void getMetricsCategory_typeIsCa_resultIsCalendarPreference() {
mFragment.mType = RegionalPreferencesFragment.TYPE_CALENDAR;
int result = mFragment.getMetricsCategory();
assertEquals(SettingsEnums.CALENDAR_PREFERENCE, result);
}
@Test
@UiThreadTest
public void getMetricsCategory_typeIsFw_resultIsFirstDayOfWeekPreference() {
mFragment.mType = RegionalPreferencesFragment.TYPE_FIRST_DAY_OF_WEEK;
int result = mFragment.getMetricsCategory();
assertEquals(SettingsEnums.FIRST_DAY_OF_WEEK_PREFERENCE, result);
}
@Test
@UiThreadTest
public void getMetricsCategory_typeIsMu_resultIsTemperaturePreference() {
mFragment.mType = RegionalPreferencesFragment.TYPE_TEMPERATURE;
int result = mFragment.getMetricsCategory();
assertEquals(SettingsEnums.TEMPERATURE_PREFERENCE, result);
}
}

31
tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitControllerTest.java
View File

@@ -48,49 +48,52 @@ public class TemperatureUnitControllerTest {
@After
public void tearDown() throws Exception {
RegionalPreferenceUtils.setSettingsProviderContent(
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, mCacheProviderContent);
Locale.setDefault(mCacheLocale);
}
@Test
public void getSummary_hasProviderValue_resultIsCelsius() {
RegionalPreferenceUtils.setSettingsProviderContent(
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, "und-u-mu-celsius");
CharSequence unit = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.TemperatureUnit.CELSIUS, unit.toString());
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "celsius_temperature_unit"), summary);
}
@Test
public void getSummary_hasProviderValue_resultIsFahrenheit() {
RegionalPreferenceUtils.setSettingsProviderContent(
RegionalPreferenceTestUtils.setSettingsProviderContent(
mApplicationContext, "und-u-mu-fahrenhe");
CharSequence unit = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.TemperatureUnit.FAHRENHEIT, unit.toString());
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "fahrenheit_temperature_unit"), summary);
}
@Test
public void getSummary_noProviderValueButHasDefaultLocaleWithSubtag_resultIsFahrenheit() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "");
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
Locale.setDefault(Locale.forLanguageTag("en-US-u-mu-fahrenhe"));
CharSequence unit = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(LocalePreferences.TemperatureUnit.FAHRENHEIT, unit.toString());
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "fahrenheit_temperature_unit"), summary);
}
@Test
public void getSummary_noProviderValueAndDefaultLocaleWithoutSubtag_resultIsEmpty() {
RegionalPreferenceUtils.setSettingsProviderContent(mApplicationContext, "");
public void getSummary_noProviderValueAndDefaultLocaleWithoutSubtag_resultIsDefault() {
RegionalPreferenceTestUtils.setSettingsProviderContent(mApplicationContext, "");
Locale.setDefault(Locale.forLanguageTag("en-US"));
CharSequence unit = mController.getSummary();
String summary = mController.getSummary().toString();
assertEquals(ResourcesUtils.getResourcesString(
mApplicationContext, "default_string_of_regional_preference"), unit.toString());
mApplicationContext, "default_string_of_regional_preference"), summary);
}
}