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

Commit 522ecbef authored by Maurice Lam's avatar Maurice Lam
Browse files

Add system APIs to implement locale picker 

Expose some system APIs to allow setup wizard to implement a locale
picker without using hidden APIs.

Test: Added GTS test
Bug: 114040620
Change-Id: I3793458d62d3131f6e2ef916be65228d75774bda
parent 40931ce4

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -276,9 +276,11 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void forceStopPackage(String);

    method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.INTERACT_ACROSS_USERS_FULL"}) public static int getCurrentUser();

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String);

    method @NonNull public java.util.Collection<java.util.Locale> getSupportedLocales();

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int);

    method @RequiresPermission(android.Manifest.permission.KILL_UID) public void killUid(int, String);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);

    method public void setDeviceLocales(@NonNull android.os.LocaleList);

    method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public static void setPersistentVrThread(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean switchUser(@NonNull android.os.UserHandle);

  }
@@ -5038,6 +5040,10 @@ package android.os { 
    field public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR;

  }













  public final class LocaleList implements android.os.Parcelable {













    method public static boolean isPseudoLocale(@Nullable android.icu.util.ULocale);













  }



























  public final class NativeHandle implements java.io.Closeable {















    ctor public NativeHandle();















    ctor public NativeHandle(@NonNull java.io.FileDescriptor, boolean);

































core/java/android/app/ActivityManager.java



+33
−0




























Original line number
Diff line number
Diff line








@@ -54,6 +54,7 @@ import android.os.Bundle;













import android.os.Debug;















import android.os.Handler;















import android.os.IBinder;













import android.os.LocaleList;















import android.os.Parcel;















import android.os.Parcelable;















import android.os.Process;









@@ -67,6 +68,7 @@ import android.util.DisplayMetrics;













import android.util.Singleton;















import android.util.Size;





























import com.android.internal.app.LocalePicker;















import com.android.internal.app.procstats.ProcessStats;















import com.android.internal.os.RoSystemProperties;















import com.android.internal.os.TransferPipe;









@@ -83,7 +85,9 @@ import java.io.PrintWriter;













import java.lang.annotation.Retention;















import java.lang.annotation.RetentionPolicy;















import java.util.ArrayList;













import java.util.Collection;















import java.util.List;













import java.util.Locale;































/**















 * <p>










@@ -3426,6 +3430,35 @@ public class ActivityManager {













        forceStopPackageAsUser(packageName, mContext.getUserId());















    }





























    /**













     * Sets the current locales of the device. Calling app must have the permission













     * {@code android.permission.CHANGE_CONFIGURATION} and













     * {@code android.permission.WRITE_SETTINGS}.













     *













     * @hide













     */













    @SystemApi













    public void setDeviceLocales(@NonNull LocaleList locales) {













        LocalePicker.updateLocales(locales);













    }



























    /**













     * Returns a list of supported locales by this system. It includes all locales that are













     * selectable by the user, potentially including locales that the framework does not have













     * translated resources for. To get locales that the framework has translated resources for, use













     * {@code Resources.getSystem().getAssets().getLocales()} instead.













     *













     * @hide













     */













    @SystemApi













    public @NonNull Collection<Locale> getSupportedLocales() {













        ArrayList<Locale> locales = new ArrayList<>();













        for (String localeTag : LocalePicker.getSupportedLocales(mContext)) {













            locales.add(Locale.forLanguageTag(localeTag));













        }













        return locales;













    }





























    /**















     * Get the device configuration attributes.















     */

































core/java/android/os/LocaleList.java



+10
−0




























Original line number
Diff line number
Diff line








@@ -20,6 +20,7 @@ import android.annotation.IntRange;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.Size;













import android.annotation.SystemApi;















import android.content.LocaleProto;















import android.icu.util.ULocale;















import android.util.proto.ProtoOutputStream;










@@ -324,6 +325,15 @@ public final class LocaleList implements Parcelable {













        return LOCALE_EN_XA.equals(locale) || LOCALE_AR_XB.equals(locale);















    }





























    /**













     * Returns true if locale is a pseudo-locale, false otherwise.













     * {@hide}













     */













    @SystemApi













    public static boolean isPseudoLocale(@Nullable ULocale locale) {













        return isPseudoLocale(locale != null ? locale.toLocale() : null);













    }





























    @IntRange(from=0, to=1)















    private static int matchScore(Locale supported, Locale desired) {















        if (supported.equals(desired)) {