Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab327533 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev

parents 92e76086 0d1638c3

src/com/android/settings/regionalpreferences/FirstDayOfWeekController.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.settings.regionalpreferences; 
import android.content.Context;

import android.provider.Settings;



import androidx.core.text.util.LocalePreferences;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

src/com/android/settings/regionalpreferences/LocalePreferences.java

deleted100644 → 0
+0 −605

File deleted.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.os.LocaleList; 
import android.provider.Settings;

import android.text.TextUtils;



import androidx.core.text.util.LocalePreferences;



import com.android.internal.app.LocalePicker;

import com.android.settings.R;

src/com/android/settings/regionalpreferences/TemperatureUnitController.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.settings.regionalpreferences; 
import android.content.Context;

import android.provider.Settings;



import androidx.core.text.util.LocalePreferences;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

tests/unit/src/com/android/settings/regionalpreferences/RegionalPreferencesDataUtilsTest.java

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.os.LocaleList;

import android.provider.Settings;



import androidx.core.text.util.LocalePreferences;

import androidx.test.core.app.ApplicationProvider;



import com.android.internal.app.LocalePicker;