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

Commit 9b759452 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents 2fdbfd57 d9d28590
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@

package org.lineageos.setupwizard;

import static androidx.appcompat.app.AppCompatDelegate.setApplicationLocales;

import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -24,8 +22,6 @@ import android.widget.ArrayAdapter;
import android.widget.NumberPicker;
import android.widget.Toast;

import androidx.core.os.LocaleListCompat;

import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.util.LocaleUtils;

@@ -53,7 +49,7 @@ public class LocaleActivity extends BaseSetupWizardActivity {
        public void run() {
            if (mCurrentLocale != null) {
                mLanguagePicker.setEnabled(false);
                setApplicationLocales(LocaleListCompat.create(mCurrentLocale));
                com.android.internal.app.LocalePicker.updateLocale(mCurrentLocale);
            }
        }
    };