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

[Regional preferences] Add numbering system page.

Browse Source 
- Add language selection page
 - Add number format page
 - Refactor some part for readability.

Bug: b/247073388
Bug: b/246929960
Test: atest pass

Change-Id: I617698a3146b6e461467a97de8c08f4c4dc6e7f2
This commit is contained in:
tom hsu
2023-01-04 07:46:08 +08:00
parent 2aab7ae039
commit 6461d16c59
22 changed files with 813 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/regionalpreferences/CalendarTypeController.java
View File

@@ -16,17 +16,10 @@
package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import java.util.Locale;
@@ -68,25 +61,7 @@ public class CalendarTypeController extends BasePreferenceController {
result = LocalePreferences.getCalendarType(false);
}
String inputStr = result.isEmpty() ? RegionalPreferencesFragment.TYPE_DEFAULT : result;
String inputStr = result.isEmpty() ? RegionalPreferencesDataUtils.DEFAULT_VALUE : result;
return RegionalPreferencesDataUtils.calendarConverter(mContext, inputStr);
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (!TextUtils.equals(preference.getKey(), mPreferenceKey)) {
Log.e(TAG, "not the key " + preference.getKey() + " / " + mPreferenceKey);
return false;
}
final Bundle extra = new Bundle();
extra.putString(RegionalPreferencesFragment.TYPE_OF_REGIONAL_PREFERENCE,
RegionalPreferencesFragment.TYPE_CALENDAR);
new SubSettingLauncher(preference.getContext())
.setDestination(RegionalPreferencesFragment.class.getName())
.setSourceMetricsCategory(SettingsEnums.REGIONAL_PREFERENCE)
.setArguments(extra)
.launch();
return true;
}
}

36
src/com/android/settings/regionalpreferences/ExtensionTypes.java Normal file
View File

@@ -0,0 +1,36 @@
/*
* 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 android.annotation.StringDef;
/** Provides necessary value of language tag to Regional Preferences. */
public class ExtensionTypes {
public static final String CALENDAR = "ca";
public static final String FIRST_DAY_OF_WEEK = "fw";
public static final String NUMBERING_SYSTEM = "nu";
public static final String TEMPERATURE_UNIT = "mu";
@StringDef({
FIRST_DAY_OF_WEEK,
CALENDAR,
TEMPERATURE_UNIT,
NUMBERING_SYSTEM
})
public @interface Values {}
}

25
src/com/android/settings/regionalpreferences/FirstDayOfWeekController.java
View File

@@ -16,18 +16,11 @@
package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import java.util.Locale;
@@ -71,22 +64,4 @@ public class FirstDayOfWeekController extends BasePreferenceController {
? mContext.getString(R.string.default_string_of_regional_preference)
: RegionalPreferencesDataUtils.dayConverter(mContext, result);
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (!TextUtils.equals(preference.getKey(), mPreferenceKey)) {
Log.e(TAG, "not the key " + preference.getKey() + " / " + mPreferenceKey);
return false;
}
final Bundle extra = new Bundle();
extra.putString(RegionalPreferencesFragment.TYPE_OF_REGIONAL_PREFERENCE,
RegionalPreferencesFragment.TYPE_FIRST_DAY_OF_WEEK);
new SubSettingLauncher(preference.getContext())
.setDestination(RegionalPreferencesFragment.class.getName())
.setSourceMetricsCategory(SettingsEnums.REGIONAL_PREFERENCE)
.setArguments(extra)
.launch();
return true;
}
}

17
src/com/android/settings/regionalpreferences/LocalePreferences.java
View File

@@ -276,7 +276,7 @@ public final class LocalePreferences {
/** Celsius */
public static final String CELSIUS = "celsius";
/** Fahrenheit */
public static final String FAHRENHEIT = "fahrenheit";
public static final String FAHRENHEIT = "fahrenhe";
/** Kelvin */
public static final String KELVIN = "kelvin";
/** Default Temperature for the locale */
@@ -301,7 +301,7 @@ public final class LocalePreferences {
/**
* Return the user's preference of the temperature unit which is from {@link
* Locale#getDefault(Locale.Category)}. The returned result is resolved and bases on the
* {@code Locale#getDefault(Locale.Category)} settings. E.g. "fahrenheit"
* {@code Locale#getDefault(Locale.Category)} settings. E.g. "fahrenhe"
*/
@NonNull
@OptIn(markerClass = BuildCompat.PrereleaseSdkCheck.class)
@@ -312,7 +312,7 @@ public final class LocalePreferences {
/**
* Return the temperature unit of the inputted {@link Locale}. The returned result is resolved
* and bases on the inputted {@code Locale} settings. E.g. "fahrenheit"
* and bases on the inputted {@code Locale} settings. E.g. "fahrenhe"
*/
@NonNull
@OptIn(markerClass = BuildCompat.PrereleaseSdkCheck.class)
@@ -324,7 +324,7 @@ public final class LocalePreferences {
/**
* Return the user's preference of the temperature unit which is from {@link
* Locale#getDefault(Locale.Category)}. E.g. "fahrenheit"
* Locale#getDefault(Locale.Category)}. E.g. "fahrenhe"
*
* @param resolved If the {@code Locale#getDefault(Locale.Category)} contains temperature unit
* subtag, this argument is ignored. If the
@@ -522,9 +522,6 @@ public final class LocalePreferences {
String mu =
locale.getUnicodeLocaleType(TemperatureUnit.U_EXTENSION_OF_TEMPERATURE_UNIT);
if (mu != null) {
if (mu.contains("fahrenhe")) {
mu = TemperatureUnit.FAHRENHEIT;
}
return mu;
}
if (!resolved) {
@@ -592,7 +589,11 @@ public final class LocalePreferences {
.usage("temperature")
.unit(MeasureUnit.CELSIUS)
.locale(locale);
return nf.format(1).getOutputUnit().getIdentifier();
String unit = nf.format(1).getOutputUnit().getIdentifier();
if (unit.contains(TemperatureUnit.FAHRENHEIT)) {
return TemperatureUnit.FAHRENHEIT;
}
return unit;
}
private Api33Impl() {

111
src/com/android/settings/regionalpreferences/NumberingPreferencesFragment.java Normal file
View File

@@ -0,0 +1,111 @@
/*
* 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 android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
/** Provides options of numbering system to each language. */
public class NumberingPreferencesFragment extends DashboardFragment {
/** Initializes variables. */
@VisibleForTesting
String initTitle() {
String option = getArguments().getString(
RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, "");
if (option.isEmpty()) {
Log.d(getLogTag(), "Option is empty.");
return "";
}
Log.i(getLogTag(), "[NumberingPreferencesFragment] option is " + option);
if (option.equals(NumberingSystemItemController.ARG_VALUE_LANGUAGE_SELECT)) {
return getContext().getString(R.string.numbers_preferences_title);
} else if (option.equals(NumberingSystemItemController.ARG_VALUE_NUMBERING_SYSTEM_SELECT)) {
String selectedLanguage = getArguments().getString(
NumberingSystemItemController.KEY_SELECTED_LANGUAGE, "");
if (selectedLanguage.isEmpty()) {
Log.w(getLogTag(), "No selected language.");
return "";
}
return Locale.forLanguageTag(selectedLanguage)
.stripExtensions()
.getDisplayName(Locale.forLanguageTag(selectedLanguage));
}
Log.w(getLogTag(), "Incorrect option : " + option);
return "";
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
String title = initTitle();
if (initTitle().isEmpty()) {
finish();
} else {
getActivity().setTitle(title);
}
}
/**
* Get a list of {@link AbstractPreferenceController} for this fragment.
*/
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
NumberingSystemItemController controller =
new NumberingSystemItemController(context, getArguments());
controller.setParentFragment(this);
List<AbstractPreferenceController> listControllers = new ArrayList<>();
listControllers.add(controller);
return listControllers;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.regional_preference_numbering_system_page;
}
/**
* Get the tag string for logging.
*/
@Override
protected String getLogTag() {
return NumberingPreferencesFragment.class.getSimpleName();
}
@Override
public int getMetricsCategory() {
String option = getArguments().getString(
RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, "");
if (option.equals(NumberingSystemItemController.ARG_VALUE_LANGUAGE_SELECT)) {
return SettingsEnums.NUMBERING_SYSTEM_LANGUAGE_SELECTION_PREFERENCE;
} else {
return SettingsEnums.NUMBERING_SYSTEM_NUMBER_FORMAT_SELECTION_PREFERENCE;
}
}
}

60
src/com/android/settings/regionalpreferences/NumberingSystemController.java
View File

@@ -16,28 +16,18 @@
package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.icu.text.NumberingSystem;
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.os.LocaleList;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import java.util.Locale;
import java.util.StringJoiner;
/** A controller for the entry of Numbering System's page */
public class NumberingSystemController extends BasePreferenceController {
private static final String TAG = NumberingSystemController.class.getSimpleName();
private static final String UNICODE_EXTENSION_NUMBERING_SYSTEM = "nu";
public NumberingSystemController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -55,49 +45,17 @@ public class NumberingSystemController extends BasePreferenceController {
*/
@Override
public int getAvailabilityStatus() {
// Hide this , and waiting for next implementation.
return CONDITIONALLY_UNAVAILABLE;
return AVAILABLE;
}
@Override
public CharSequence getSummary() {
String record = Settings.System.getString(
mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES);
String result = "";
if (!TextUtils.isEmpty(record)) {
result = Locale.forLanguageTag(record)
.getUnicodeLocaleType(UNICODE_EXTENSION_NUMBERING_SYSTEM);
LocaleList localeList = LocaleList.getDefault();
StringJoiner stringJoiner = new StringJoiner(", ");
for (int i = 0; i < localeList.size(); i++) {
Locale locale = localeList.get(i);
stringJoiner.add(locale.stripExtensions().getDisplayName(locale));
}
if (TextUtils.isEmpty(result)) {
result = Locale.getDefault(Locale.Category.FORMAT)
.getUnicodeLocaleType(UNICODE_EXTENSION_NUMBERING_SYSTEM);
if (TextUtils.isEmpty(result)) {
return mContext.getString(R.string.default_string_of_regional_preference);
}
}
Locale locale = new Locale.Builder()
.setUnicodeLocaleKeyword(UNICODE_EXTENSION_NUMBERING_SYSTEM, result)
.build();
return NumberingSystem.getInstance(locale).getName();
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (!TextUtils.equals(preference.getKey(), mPreferenceKey)) {
Log.e(TAG, "not the key " + preference.getKey() + " / " + mPreferenceKey);
return false;
}
final Bundle extra = new Bundle();
extra.putString(RegionalPreferencesFragment.TYPE_OF_REGIONAL_PREFERENCE,
RegionalPreferencesFragment.TYPE_NUMBERING_SYSTEM);
new SubSettingLauncher(preference.getContext())
.setDestination(RegionalPreferencesFragment.class.getName())
.setSourceMetricsCategory(SettingsEnums.REGIONAL_PREFERENCE)
.setArguments(extra)
.launch();
return true;
return stringJoiner.toString();
}
}

216
src/com/android/settings/regionalpreferences/NumberingSystemItemController.java Normal file
View File

@@ -0,0 +1,216 @@
/*
* 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 android.app.settings.SettingsEnums;
import android.content.Context;
import android.icu.text.NumberingSystem;
import android.icu.util.ULocale;
import android.os.Bundle;
import android.os.LocaleList;
import android.text.TextUtils;
import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.app.LocaleHelper;
import com.android.internal.app.LocalePicker;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import java.util.Locale;
/** Uses to control the preference UI of numbering system page. */
public class NumberingSystemItemController extends BasePreferenceController {
private static final String TAG = NumberingSystemItemController.class.getSimpleName();
static final String ARG_VALUE_NUMBERING_SYSTEM_SELECT = "arg_value_numbering_system_select";
static final String ARG_VALUE_LANGUAGE_SELECT = "arg_value_language_select";
static final String KEY_SELECTED_LANGUAGE = "key_selected_language";
private static final String DISPLAY_KEYWORD_NUMBERING_SYSTEM = "numbers";
private String mOption = "";
private String mSelectedLanguage = "";
private DashboardFragment mParentFragment;
private PreferenceScreen mPreferenceScreen;
public NumberingSystemItemController(Context context, Bundle argument) {
super(context, "no_key");
mOption = argument.getString(
RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, "");
mSelectedLanguage = argument.getString(
NumberingSystemItemController.KEY_SELECTED_LANGUAGE, "");
}
/**
* Displays preference in this controller.
*/
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreferenceScreen = screen;
if (mOption.equals(ARG_VALUE_LANGUAGE_SELECT)) {
initLanguageOptionsUi(screen);
} else if (mOption.equals(ARG_VALUE_NUMBERING_SYSTEM_SELECT)) {
initNumberingSystemOptionsUi(screen, Locale.forLanguageTag(mSelectedLanguage));
}
}
/**
* Sets the parent fragment and attaches this controller to the settings lifecycle.
*
* @param fragment the fragment to use as the parent
*/
public void setParentFragment(DashboardFragment fragment) {
mParentFragment = fragment;
}
/**
* @return {@link AvailabilityStatus} for the Setting. This status is used to determine if the
* Setting should be shown or disabled in Settings. Further, it can be used to produce
* appropriate error / warning Slice in the case of unavailability.
* </p>
* The status is used for the convenience methods: {@link #isAvailable()}, {@link
* #isSupported()}
* </p>
* The inherited class doesn't need to check work profile if android:forWork="true" is set in
* preference xml.
*/
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (mOption.equals(ARG_VALUE_LANGUAGE_SELECT)) {
handleLanguageSelect(preference);
} else if (mOption.equals(ARG_VALUE_NUMBERING_SYSTEM_SELECT)) {
handleNumberSystemSelect(preference);
}
return true;
}
private void initLanguageOptionsUi(PreferenceScreen screen) {
// Get current system language list to show on screen.
LocaleList localeList = LocaleList.getDefault();
for (int i = 0; i < localeList.size(); i++) {
Preference pref = new Preference(mContext);
Locale locale = localeList.get(i);
pref.setTitle(LocaleHelper.getDisplayName(locale.stripExtensions(), locale, true));
pref.setKey(locale.toLanguageTag());
pref.setSummary(getNumberingSystem(locale));
screen.addPreference(pref);
}
}
private void initNumberingSystemOptionsUi(PreferenceScreen screen, Locale targetLocale) {
String[] locales = LocalePicker.getSupportedLocales(mContext);
for (String localeTag : locales) {
Locale supportedLocale = Locale.forLanguageTag(localeTag);
if (isSameBaseLocale(targetLocale, supportedLocale)) {
TickButtonPreference pref = new TickButtonPreference(mContext);
String numberingName = getNumberingSystem(supportedLocale);
pref.setTitle(numberingName);
String key = supportedLocale.getUnicodeLocaleType(
ExtensionTypes.NUMBERING_SYSTEM);
pref.setKey(key == null ? RegionalPreferencesDataUtils.DEFAULT_VALUE : key);
pref.setTickEnable(isSameNumberingSystem(targetLocale, supportedLocale));
screen.addPreference(pref);
}
}
}
private void handleLanguageSelect(Preference preference) {
final Bundle extra = new Bundle();
extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE,
ARG_VALUE_NUMBERING_SYSTEM_SELECT);
extra.putString(KEY_SELECTED_LANGUAGE, preference.getKey());
new SubSettingLauncher(preference.getContext())
.setDestination(NumberingPreferencesFragment.class.getName())
.setSourceMetricsCategory(
SettingsEnums.NUMBERING_SYSTEM_LANGUAGE_SELECTION_PREFERENCE)
.setArguments(extra)
.launch();
}
private void handleNumberSystemSelect(Preference preference) {
for (int i = 0; i < mPreferenceScreen.getPreferenceCount(); i++) {
TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(i);
Log.i(TAG, "[onPreferenceClick] key is " + pref.getKey());
if (pref.getKey().equals(preference.getKey())) {
pref.setTickEnable(true);
Locale updatedLocale =
saveNumberingSystemToLocale(
Locale.forLanguageTag(mSelectedLanguage), pref.getKey());
// After updated locale to framework, this fragment will recreate,
// so it need to update the argement of selected language.
Bundle bundle = new Bundle();
bundle.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE,
ARG_VALUE_NUMBERING_SYSTEM_SELECT);
bundle.putString(KEY_SELECTED_LANGUAGE, updatedLocale.toLanguageTag());
mParentFragment.setArguments(bundle);
continue;
}
pref.setTickEnable(false);
}
}
private Locale saveNumberingSystemToLocale(Locale targetLocale, String value) {
LocaleList localeList = LocalePicker.getLocales();
Locale[] locales = new Locale[localeList.size()];
for (int i = 0; i < localeList.size(); i++) {
Locale locale = localeList.get(i);
if (targetLocale.equals(locale)) {
if (value.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE)) {
value = null;
}
Locale updatedLocale = new Locale.Builder()
.setLocale(locale)
.setUnicodeLocaleKeyword(ExtensionTypes.NUMBERING_SYSTEM, value)
.build();
locales[i] = updatedLocale;
continue;
}
locales[i] = localeList.get(i);
}
LocalePicker.updateLocales(new LocaleList(locales));
return targetLocale;
}
private static String getNumberingSystem(Locale locale) {
ULocale uLocale = new ULocale.Builder()
.setUnicodeLocaleKeyword(ExtensionTypes.NUMBERING_SYSTEM,
NumberingSystem.getInstance(locale).getName())
.build();
return uLocale.getDisplayKeywordValue(DISPLAY_KEYWORD_NUMBERING_SYSTEM,
ULocale.forLocale(locale));
}
private static boolean isSameNumberingSystem(Locale locale1, Locale locale2) {
String name1 = NumberingSystem.getInstance(locale1).getName();
String name2 = NumberingSystem.getInstance(locale2).getName();
return TextUtils.equals(name1, name2);
}
private static boolean isSameBaseLocale(Locale locale1, Locale locale2) {
return locale1.stripExtensions().equals(locale2.stripExtensions());
}
}

32
src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtils.java
View File

@@ -29,10 +29,8 @@ import java.util.Locale;
/** Provides utils for regional preferences. */
public class RegionalPreferencesDataUtils {
private static final String TAG = RegionalPreferencesDataUtils.class.getSimpleName();
private static final String U_EXTENSION_FAHRENHEIT = "fahrenhe";
private static final String KEYWORD_OF_CALENDAR = "calendar";
static final String DISPLAY_KEYWORD_OF_CALENDAR = "calendar";
static final String DEFAULT_VALUE = "default";
static String getDefaultUnicodeExtensionData(Context contxt, String type) {
// 1. Check cache data in Settings provider.
@@ -47,27 +45,11 @@ public class RegionalPreferencesDataUtils {
if (TextUtils.isEmpty(result)) {
result = Locale.getDefault(Locale.Category.FORMAT).getUnicodeLocaleType(type);
}
if (result == null) {
return RegionalPreferencesFragment.TYPE_DEFAULT;
}
// In BCP47 expression, the tag of fahrenheit is "fahrenhe" i.e. und-u-mu-fahrenhe,
// so if it may need to convert from the langngiage tag, "fahrenhe", to "fahrenheit".
if (result.equals(U_EXTENSION_FAHRENHEIT)) {
return LocalePreferences.TemperatureUnit.FAHRENHEIT;
}
return result;
return result == null ? DEFAULT_VALUE : result;
}
static void savePreference(Context context, String type, String value) {
if (type.equals(RegionalPreferencesFragment.TYPE_TEMPERATURE)
&& value != null && value.equals(LocalePreferences.TemperatureUnit.FAHRENHEIT)) {
// In BCP47 expression, the temperature unit is expressed to "fahrenhe"
// i.e. zh-TW-u-mu-fahrenhe. Hence, if we want to save fahrenheit unit to u extension,
// It need to change from "fahrenheit" to "fahrenhe".
value = U_EXTENSION_FAHRENHEIT;
}
saveToSettingsProvider(context, type, value);
saveToSystem(type, value);
}
@@ -105,14 +87,14 @@ public class RegionalPreferencesDataUtils {
}
static String calendarConverter(Context context, String calendarType) {
if (calendarType.equals(RegionalPreferencesFragment.TYPE_DEFAULT)) {
if (calendarType.equals(DEFAULT_VALUE)) {
return context.getString(R.string.default_string_of_regional_preference);
}
Locale locale = new Locale.Builder()
.setUnicodeLocaleKeyword(RegionalPreferencesFragment.TYPE_CALENDAR, calendarType)
.setUnicodeLocaleKeyword(ExtensionTypes.CALENDAR, calendarType)
.build();
return ULocale.getDisplayKeywordValue(locale.toLanguageTag(), KEYWORD_OF_CALENDAR,
return ULocale.getDisplayKeywordValue(locale.toLanguageTag(), DISPLAY_KEYWORD_OF_CALENDAR,
ULocale.forLocale(Locale.getDefault(Locale.Category.FORMAT)));
}
@@ -122,8 +104,6 @@ public class RegionalPreferencesDataUtils {
return context.getString(R.string.celsius_temperature_unit);
case LocalePreferences.TemperatureUnit.FAHRENHEIT:
return context.getString(R.string.fahrenheit_temperature_unit);
case LocalePreferences.TemperatureUnit.KELVIN:
return context.getString(R.string.kevin_temperature_unit);
default:
return context.getString(R.string.default_string_of_regional_preference);
}

2
src/com/android/settings/regionalpreferences/RegionalPreferencesEntriesFragment.java
View File

@@ -28,6 +28,8 @@ import com.android.settingslib.search.SearchIndexable;
public class RegionalPreferencesEntriesFragment extends DashboardFragment {
private static final String TAG = RegionalPreferencesEntriesFragment.class.getSimpleName();
static final String ARG_KEY_REGIONAL_PREFERENCE = "arg_key_regional_preference";
@Override
public void onStart() {
super.onStart();

40
src/com/android/settings/regionalpreferences/RegionalPreferencesFragment.java
View File

@@ -34,13 +34,6 @@ import com.android.settings.SettingsPreferenceFragment;
public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
private static final String TAG = RegionalPreferencesFragment.class.getSimpleName();
static final String TYPE_DEFAULT = "default";
static final String TYPE_TEMPERATURE = "mu";
static final String TYPE_CALENDAR = "ca";
static final String TYPE_FIRST_DAY_OF_WEEK = "fw";
static final String TYPE_NUMBERING_SYSTEM = "nu";
static final String TYPE_OF_REGIONAL_PREFERENCE = "type_of_regional_preference";
private PreferenceScreen mPreferenceScreen;
private String mTitle = "";
@VisibleForTesting
@@ -48,18 +41,15 @@ public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
private String[] initializeUIdata(String type) {
switch(type) {
case TYPE_TEMPERATURE:
case ExtensionTypes.TEMPERATURE_UNIT:
mTitle = getPrefContext().getString(R.string.temperature_preferences_title);
return getPrefContext().getResources().getStringArray(R.array.temperature_units);
case TYPE_CALENDAR:
case ExtensionTypes.CALENDAR:
mTitle = getPrefContext().getString(R.string.calendar_preferences_title);
return getPrefContext().getResources().getStringArray(R.array.calendar_type);
case TYPE_FIRST_DAY_OF_WEEK:
case ExtensionTypes.FIRST_DAY_OF_WEEK:
mTitle = getPrefContext().getString(R.string.first_day_of_week_preferences_title);
return getPrefContext().getResources().getStringArray(R.array.first_day_of_week);
case TYPE_NUMBERING_SYSTEM:
mTitle = getPrefContext().getString(R.string.numbers_preferences_title);
return new String[0];
default:
mTitle = getPrefContext().getString(R.string.regional_preferences_title);
return new String[0];
@@ -68,7 +58,8 @@ public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
@Override
public boolean onPreferenceTreeClick(Preference preference) {
for (int i = 0; i < mPreferenceScreen.getPreferenceCount(); i++) {
// The first preference is TopIntroPreference
for (int i = 1; i < mPreferenceScreen.getPreferenceCount(); i++) {
TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(i);
Log.i(TAG, "[onPreferenceClick] key is " + pref.getKey());
if (pref.getKey().equals(preference.getKey())) {
@@ -76,7 +67,9 @@ public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
RegionalPreferencesDataUtils.savePreference(
getPrefContext(),
mType,
preference.getKey().equals(TYPE_DEFAULT) ? null : preference.getKey());
preference.getKey().equals(
RegionalPreferencesDataUtils.DEFAULT_VALUE)
? null : preference.getKey());
continue;
}
pref.setTickEnable(false);
@@ -88,7 +81,8 @@ public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
Bundle bundle = getArguments();
String type = bundle.getString(TYPE_OF_REGIONAL_PREFERENCE, "");
String type = bundle.getString(
RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, "");
if (type.isEmpty()) {
Log.w(TAG, "There is no type name.");
finish();
@@ -101,18 +95,16 @@ public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = super.onCreateView(inflater, container, savedInstanceState);
String[] uiData = initializeUIdata(mType);
for (String item : uiData) {
TickButtonPreference pref = new TickButtonPreference(getPrefContext());
if (mType.equals(TYPE_FIRST_DAY_OF_WEEK)) {
if (mType.equals(ExtensionTypes.FIRST_DAY_OF_WEEK)) {
pref.setTitle(RegionalPreferencesDataUtils.dayConverter(
getPrefContext(), item));
} else if (mType.equals(TYPE_TEMPERATURE)) {
} else if (mType.equals(ExtensionTypes.TEMPERATURE_UNIT)) {
pref.setTitle(RegionalPreferencesDataUtils.temperatureUnitsConverter(
getPrefContext(), item));
} else if (mType.equals(TYPE_CALENDAR)) {
} else if (mType.equals(ExtensionTypes.CALENDAR)) {
pref.setTitle(RegionalPreferencesDataUtils.calendarConverter(
getPrefContext(), item));
} else {
@@ -126,7 +118,7 @@ public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
pref.setTickEnable(!value.isEmpty() && item.equals(value));
mPreferenceScreen.addPreference(pref);
}
return view;
return super.onCreateView(inflater, container, savedInstanceState);
}
@Override
@@ -138,9 +130,9 @@ public class RegionalPreferencesFragment extends SettingsPreferenceFragment {
@Override
public int getMetricsCategory() {
switch(mType) {
case TYPE_CALENDAR:
case ExtensionTypes.CALENDAR:
return SettingsEnums.CALENDAR_PREFERENCE;
case TYPE_FIRST_DAY_OF_WEEK:
case ExtensionTypes.FIRST_DAY_OF_WEEK:
return SettingsEnums.FIRST_DAY_OF_WEEK_PREFERENCE;
default:
return SettingsEnums.TEMPERATURE_PREFERENCE;

24
src/com/android/settings/regionalpreferences/TemperatureUnitController.java
View File

@@ -16,18 +16,11 @@
package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import java.util.Locale;
@@ -71,21 +64,4 @@ public class TemperatureUnitController extends BasePreferenceController {
? mContext.getString(R.string.default_string_of_regional_preference)
: RegionalPreferencesDataUtils.temperatureUnitsConverter(mContext, result);
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (!TextUtils.equals(preference.getKey(), mPreferenceKey)) {
Log.e(TAG, "not the key " + preference.getKey() + " / " + mPreferenceKey);
return false;
}
final Bundle extra = new Bundle();
extra.putString(RegionalPreferencesFragment.TYPE_OF_REGIONAL_PREFERENCE,
RegionalPreferencesFragment.TYPE_TEMPERATURE);
new SubSettingLauncher(preference.getContext())
.setDestination(RegionalPreferencesFragment.class.getName())
.setSourceMetricsCategory(SettingsEnums.REGIONAL_PREFERENCE)
.setArguments(extra)
.launch();
return true;
}
}