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

Commit 23cbe856 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Move LocaleList to avoid layering violation. 

Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
parent e1f6975e

api/current.txt

+29 −29
Original line number Diff line number Diff line
@@ -10116,14 +10116,14 @@ package android.content.res { 
    method public int diff(android.content.res.Configuration);

    method public boolean equals(android.content.res.Configuration);

    method public int getLayoutDirection();

    method public android.util.LocaleList getLocales();

    method public android.os.LocaleList getLocales();

    method public boolean isLayoutSizeAtLeast(int);

    method public boolean isScreenRound();

    method public static boolean needNewResources(int, int);

    method public void readFromParcel(android.os.Parcel);

    method public void setLayoutDirection(java.util.Locale);

    method public void setLocale(java.util.Locale);

    method public void setLocales(android.util.LocaleList);

    method public void setLocales(android.os.LocaleList);

    method public void setTo(android.content.res.Configuration);

    method public void setToDefaults();

    method public int updateFrom(android.content.res.Configuration);
@@ -12035,7 +12035,7 @@ package android.graphics { 
    method public void getTextBounds(java.lang.String, int, int, android.graphics.Rect);

    method public void getTextBounds(char[], int, int, android.graphics.Rect);

    method public java.util.Locale getTextLocale();

    method public android.util.LocaleList getTextLocales();

    method public android.os.LocaleList getTextLocales();

    method public void getTextPath(char[], int, int, float, float, android.graphics.Path);

    method public void getTextPath(java.lang.String, int, int, float, float, android.graphics.Path);

    method public float getTextScaleX();
@@ -12091,7 +12091,7 @@ package android.graphics { 
    method public void setSubpixelText(boolean);

    method public void setTextAlign(android.graphics.Paint.Align);

    method public void setTextLocale(java.util.Locale);

    method public void setTextLocales(android.util.LocaleList);

    method public void setTextLocales(android.os.LocaleList);

    method public void setTextScaleX(float);

    method public void setTextSize(float);

    method public void setTextSkewX(float);
@@ -28675,6 +28675,24 @@ package android.os { 
    method public abstract android.os.IBinder asBinder();

  }













  public final class LocaleList implements android.os.Parcelable {













    ctor public LocaleList(java.util.Locale...);













    method public int describeContents();













    method public static android.os.LocaleList forLanguageTags(java.lang.String);













    method public java.util.Locale get(int);













    method public static android.os.LocaleList getAdjustedDefault();













    method public static android.os.LocaleList getDefault();













    method public static android.os.LocaleList getEmptyLocaleList();













    method public java.util.Locale getFirstMatch(java.lang.String[]);













    method public int indexOf(java.util.Locale);













    method public boolean isEmpty();













    method public static void setDefault(android.os.LocaleList);













    method public int size();













    method public java.lang.String toLanguageTags();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.os.LocaleList> CREATOR;













  }



























  public final class Looper {















    method public void dump(android.util.Printer, java.lang.String);















    method public static android.os.Looper getMainLooper();










@@ -39215,11 +39233,11 @@ package android.text.style {



























  public class LocaleSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {















    ctor public LocaleSpan(java.util.Locale);













    ctor public LocaleSpan(android.util.LocaleList);













    ctor public LocaleSpan(android.os.LocaleList);















    ctor public LocaleSpan(android.os.Parcel);















    method public int describeContents();















    method public java.util.Locale getLocale();













    method public android.util.LocaleList getLocales();













    method public android.os.LocaleList getLocales();















    method public int getSpanTypeId();















    method public void updateDrawState(android.text.TextPaint);















    method public void updateMeasureState(android.text.TextPaint);










@@ -40238,24 +40256,6 @@ package android.util {













    field public static final int RTL = 1; // 0x1















  }



























  public final class LocaleList implements android.os.Parcelable {













    ctor public LocaleList(java.util.Locale...);













    method public int describeContents();













    method public static android.util.LocaleList forLanguageTags(java.lang.String);













    method public java.util.Locale get(int);













    method public static android.util.LocaleList getAdjustedDefault();













    method public static android.util.LocaleList getDefault();













    method public static android.util.LocaleList getEmptyLocaleList();













    method public java.util.Locale getFirstMatch(java.lang.String[]);













    method public int indexOf(java.util.Locale);













    method public boolean isEmpty();













    method public static void setDefault(android.util.LocaleList);













    method public int size();













    method public java.lang.String toLanguageTags();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.util.LocaleList> CREATOR;













  }



























  public final class Log {















    method public static int d(java.lang.String, java.lang.String);















    method public static int d(java.lang.String, java.lang.String, java.lang.Throwable);










@@ -44655,7 +44655,7 @@ package android.view.inputmethod {













    field public android.os.Bundle extras;















    field public int fieldId;















    field public java.lang.String fieldName;













    field public android.util.LocaleList hintLocales;













    field public android.os.LocaleList hintLocales;















    field public java.lang.CharSequence hintText;















    field public int imeOptions;















    field public int initialCapsMode;










@@ -47942,7 +47942,7 @@ package android.widget {













    method public int getHyphenationFrequency();















    method public int getImeActionId();















    method public java.lang.CharSequence getImeActionLabel();













    method public android.util.LocaleList getImeHintLocales();













    method public android.os.LocaleList getImeHintLocales();















    method public int getImeOptions();















    method public boolean getIncludeFontPadding();















    method public android.os.Bundle getInputExtras(boolean);










@@ -47981,7 +47981,7 @@ package android.widget {













    method public java.lang.CharSequence getText();















    method public final android.content.res.ColorStateList getTextColors();















    method public java.util.Locale getTextLocale();













    method public android.util.LocaleList getTextLocales();













    method public android.os.LocaleList getTextLocales();















    method public float getTextScaleX();















    method public float getTextSize();















    method public int getTotalPaddingBottom();










@@ -48049,7 +48049,7 @@ package android.widget {













    method public void setHorizontallyScrolling(boolean);















    method public void setHyphenationFrequency(int);















    method public void setImeActionLabel(java.lang.CharSequence, int);













    method public void setImeHintLocales(android.util.LocaleList);













    method public void setImeHintLocales(android.os.LocaleList);















    method public void setImeOptions(int);















    method public void setIncludeFontPadding(boolean);















    method public void setInputExtras(int) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;










@@ -48095,7 +48095,7 @@ package android.widget {













    method public final void setTextKeepState(java.lang.CharSequence);















    method public final void setTextKeepState(java.lang.CharSequence, android.widget.TextView.BufferType);















    method public void setTextLocale(java.util.Locale);













    method public void setTextLocales(android.util.LocaleList);













    method public void setTextLocales(android.os.LocaleList);















    method public void setTextScaleX(float);















    method public void setTextSize(float);















    method public void setTextSize(int, float);

























api/system-current.txt



+29
−29




























Original line number
Diff line number
Diff line








@@ -10557,14 +10557,14 @@ package android.content.res {













    method public int diff(android.content.res.Configuration);















    method public boolean equals(android.content.res.Configuration);















    method public int getLayoutDirection();













    method public android.util.LocaleList getLocales();













    method public android.os.LocaleList getLocales();















    method public boolean isLayoutSizeAtLeast(int);















    method public boolean isScreenRound();















    method public static boolean needNewResources(int, int);















    method public void readFromParcel(android.os.Parcel);















    method public void setLayoutDirection(java.util.Locale);















    method public void setLocale(java.util.Locale);













    method public void setLocales(android.util.LocaleList);













    method public void setLocales(android.os.LocaleList);















    method public void setTo(android.content.res.Configuration);















    method public void setToDefaults();















    method public int updateFrom(android.content.res.Configuration);










@@ -12476,7 +12476,7 @@ package android.graphics {













    method public void getTextBounds(java.lang.String, int, int, android.graphics.Rect);















    method public void getTextBounds(char[], int, int, android.graphics.Rect);















    method public java.util.Locale getTextLocale();













    method public android.util.LocaleList getTextLocales();













    method public android.os.LocaleList getTextLocales();















    method public void getTextPath(char[], int, int, float, float, android.graphics.Path);















    method public void getTextPath(java.lang.String, int, int, float, float, android.graphics.Path);















    method public float getTextScaleX();










@@ -12532,7 +12532,7 @@ package android.graphics {













    method public void setSubpixelText(boolean);















    method public void setTextAlign(android.graphics.Paint.Align);















    method public void setTextLocale(java.util.Locale);













    method public void setTextLocales(android.util.LocaleList);













    method public void setTextLocales(android.os.LocaleList);















    method public void setTextScaleX(float);















    method public void setTextSize(float);















    method public void setTextSkewX(float);










@@ -31118,6 +31118,24 @@ package android.os {













    method public abstract android.os.IBinder asBinder();















  }



























  public final class LocaleList implements android.os.Parcelable {













    ctor public LocaleList(java.util.Locale...);













    method public int describeContents();













    method public static android.os.LocaleList forLanguageTags(java.lang.String);













    method public java.util.Locale get(int);













    method public static android.os.LocaleList getAdjustedDefault();













    method public static android.os.LocaleList getDefault();













    method public static android.os.LocaleList getEmptyLocaleList();













    method public java.util.Locale getFirstMatch(java.lang.String[]);













    method public int indexOf(java.util.Locale);













    method public boolean isEmpty();













    method public static void setDefault(android.os.LocaleList);













    method public int size();













    method public java.lang.String toLanguageTags();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.os.LocaleList> CREATOR;













  }



























  public final class Looper {















    method public void dump(android.util.Printer, java.lang.String);















    method public static android.os.Looper getMainLooper();










@@ -42217,11 +42235,11 @@ package android.text.style {



























  public class LocaleSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {















    ctor public LocaleSpan(java.util.Locale);













    ctor public LocaleSpan(android.util.LocaleList);













    ctor public LocaleSpan(android.os.LocaleList);















    ctor public LocaleSpan(android.os.Parcel);















    method public int describeContents();















    method public java.util.Locale getLocale();













    method public android.util.LocaleList getLocales();













    method public android.os.LocaleList getLocales();















    method public int getSpanTypeId();















    method public void updateDrawState(android.text.TextPaint);















    method public void updateMeasureState(android.text.TextPaint);










@@ -43240,24 +43258,6 @@ package android.util {













    field public static final int RTL = 1; // 0x1















  }



























  public final class LocaleList implements android.os.Parcelable {













    ctor public LocaleList(java.util.Locale...);













    method public int describeContents();













    method public static android.util.LocaleList forLanguageTags(java.lang.String);













    method public java.util.Locale get(int);













    method public static android.util.LocaleList getAdjustedDefault();













    method public static android.util.LocaleList getDefault();













    method public static android.util.LocaleList getEmptyLocaleList();













    method public java.util.Locale getFirstMatch(java.lang.String[]);













    method public int indexOf(java.util.Locale);













    method public boolean isEmpty();













    method public static void setDefault(android.util.LocaleList);













    method public int size();













    method public java.lang.String toLanguageTags();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.util.LocaleList> CREATOR;













  }



























  public final class Log {















    method public static int d(java.lang.String, java.lang.String);















    method public static int d(java.lang.String, java.lang.String, java.lang.Throwable);










@@ -47660,7 +47660,7 @@ package android.view.inputmethod {













    field public android.os.Bundle extras;















    field public int fieldId;















    field public java.lang.String fieldName;













    field public android.util.LocaleList hintLocales;













    field public android.os.LocaleList hintLocales;















    field public java.lang.CharSequence hintText;















    field public int imeOptions;















    field public int initialCapsMode;










@@ -51301,7 +51301,7 @@ package android.widget {













    method public int getHyphenationFrequency();















    method public int getImeActionId();















    method public java.lang.CharSequence getImeActionLabel();













    method public android.util.LocaleList getImeHintLocales();













    method public android.os.LocaleList getImeHintLocales();















    method public int getImeOptions();















    method public boolean getIncludeFontPadding();















    method public android.os.Bundle getInputExtras(boolean);










@@ -51340,7 +51340,7 @@ package android.widget {













    method public java.lang.CharSequence getText();















    method public final android.content.res.ColorStateList getTextColors();















    method public java.util.Locale getTextLocale();













    method public android.util.LocaleList getTextLocales();













    method public android.os.LocaleList getTextLocales();















    method public float getTextScaleX();















    method public float getTextSize();















    method public int getTotalPaddingBottom();










@@ -51408,7 +51408,7 @@ package android.widget {













    method public void setHorizontallyScrolling(boolean);















    method public void setHyphenationFrequency(int);















    method public void setImeActionLabel(java.lang.CharSequence, int);













    method public void setImeHintLocales(android.util.LocaleList);













    method public void setImeHintLocales(android.os.LocaleList);















    method public void setImeOptions(int);















    method public void setIncludeFontPadding(boolean);















    method public void setInputExtras(int) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;










@@ -51454,7 +51454,7 @@ package android.widget {













    method public final void setTextKeepState(java.lang.CharSequence);















    method public final void setTextKeepState(java.lang.CharSequence, android.widget.TextView.BufferType);















    method public void setTextLocale(java.util.Locale);













    method public void setTextLocales(android.util.LocaleList);













    method public void setTextLocales(android.os.LocaleList);















    method public void setTextScaleX(float);















    method public void setTextSize(float);















    method public void setTextSize(int, float);

























api/test-current.txt



+29
−29




























Original line number
Diff line number
Diff line








@@ -10129,14 +10129,14 @@ package android.content.res {













    method public int diff(android.content.res.Configuration);















    method public boolean equals(android.content.res.Configuration);















    method public int getLayoutDirection();













    method public android.util.LocaleList getLocales();













    method public android.os.LocaleList getLocales();















    method public boolean isLayoutSizeAtLeast(int);















    method public boolean isScreenRound();















    method public static boolean needNewResources(int, int);















    method public void readFromParcel(android.os.Parcel);















    method public void setLayoutDirection(java.util.Locale);















    method public void setLocale(java.util.Locale);













    method public void setLocales(android.util.LocaleList);













    method public void setLocales(android.os.LocaleList);















    method public void setTo(android.content.res.Configuration);















    method public void setToDefaults();















    method public int updateFrom(android.content.res.Configuration);










@@ -12048,7 +12048,7 @@ package android.graphics {













    method public void getTextBounds(java.lang.String, int, int, android.graphics.Rect);















    method public void getTextBounds(char[], int, int, android.graphics.Rect);















    method public java.util.Locale getTextLocale();













    method public android.util.LocaleList getTextLocales();













    method public android.os.LocaleList getTextLocales();















    method public void getTextPath(char[], int, int, float, float, android.graphics.Path);















    method public void getTextPath(java.lang.String, int, int, float, float, android.graphics.Path);















    method public float getTextScaleX();










@@ -12104,7 +12104,7 @@ package android.graphics {













    method public void setSubpixelText(boolean);















    method public void setTextAlign(android.graphics.Paint.Align);















    method public void setTextLocale(java.util.Locale);













    method public void setTextLocales(android.util.LocaleList);













    method public void setTextLocales(android.os.LocaleList);















    method public void setTextScaleX(float);















    method public void setTextSize(float);















    method public void setTextSkewX(float);










@@ -28744,6 +28744,24 @@ package android.os {













    method public abstract android.os.IBinder asBinder();















  }



























  public final class LocaleList implements android.os.Parcelable {













    ctor public LocaleList(java.util.Locale...);













    method public int describeContents();













    method public static android.os.LocaleList forLanguageTags(java.lang.String);













    method public java.util.Locale get(int);













    method public static android.os.LocaleList getAdjustedDefault();













    method public static android.os.LocaleList getDefault();













    method public static android.os.LocaleList getEmptyLocaleList();













    method public java.util.Locale getFirstMatch(java.lang.String[]);













    method public int indexOf(java.util.Locale);













    method public boolean isEmpty();













    method public static void setDefault(android.os.LocaleList);













    method public int size();













    method public java.lang.String toLanguageTags();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.os.LocaleList> CREATOR;













  }



























  public final class Looper {















    method public void dump(android.util.Printer, java.lang.String);















    method public static android.os.Looper getMainLooper();










@@ -39294,11 +39312,11 @@ package android.text.style {



























  public class LocaleSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {















    ctor public LocaleSpan(java.util.Locale);













    ctor public LocaleSpan(android.util.LocaleList);













    ctor public LocaleSpan(android.os.LocaleList);















    ctor public LocaleSpan(android.os.Parcel);















    method public int describeContents();















    method public java.util.Locale getLocale();













    method public android.util.LocaleList getLocales();













    method public android.os.LocaleList getLocales();















    method public int getSpanTypeId();















    method public void updateDrawState(android.text.TextPaint);















    method public void updateMeasureState(android.text.TextPaint);










@@ -40317,24 +40335,6 @@ package android.util {













    field public static final int RTL = 1; // 0x1















  }



























  public final class LocaleList implements android.os.Parcelable {













    ctor public LocaleList(java.util.Locale...);













    method public int describeContents();













    method public static android.util.LocaleList forLanguageTags(java.lang.String);













    method public java.util.Locale get(int);













    method public static android.util.LocaleList getAdjustedDefault();













    method public static android.util.LocaleList getDefault();













    method public static android.util.LocaleList getEmptyLocaleList();













    method public java.util.Locale getFirstMatch(java.lang.String[]);













    method public int indexOf(java.util.Locale);













    method public boolean isEmpty();













    method public static void setDefault(android.util.LocaleList);













    method public int size();













    method public java.lang.String toLanguageTags();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.util.LocaleList> CREATOR;













  }



























  public final class Log {















    method public static int d(java.lang.String, java.lang.String);















    method public static int d(java.lang.String, java.lang.String, java.lang.Throwable);










@@ -44734,7 +44734,7 @@ package android.view.inputmethod {













    field public android.os.Bundle extras;















    field public int fieldId;















    field public java.lang.String fieldName;













    field public android.util.LocaleList hintLocales;













    field public android.os.LocaleList hintLocales;















    field public java.lang.CharSequence hintText;















    field public int imeOptions;















    field public int initialCapsMode;










@@ -48021,7 +48021,7 @@ package android.widget {













    method public int getHyphenationFrequency();















    method public int getImeActionId();















    method public java.lang.CharSequence getImeActionLabel();













    method public android.util.LocaleList getImeHintLocales();













    method public android.os.LocaleList getImeHintLocales();















    method public int getImeOptions();















    method public boolean getIncludeFontPadding();















    method public android.os.Bundle getInputExtras(boolean);










@@ -48060,7 +48060,7 @@ package android.widget {













    method public java.lang.CharSequence getText();















    method public final android.content.res.ColorStateList getTextColors();















    method public java.util.Locale getTextLocale();













    method public android.util.LocaleList getTextLocales();













    method public android.os.LocaleList getTextLocales();















    method public float getTextScaleX();















    method public float getTextSize();















    method public int getTotalPaddingBottom();










@@ -48128,7 +48128,7 @@ package android.widget {













    method public void setHorizontallyScrolling(boolean);















    method public void setHyphenationFrequency(int);















    method public void setImeActionLabel(java.lang.CharSequence, int);













    method public void setImeHintLocales(android.util.LocaleList);













    method public void setImeHintLocales(android.os.LocaleList);















    method public void setImeOptions(int);















    method public void setIncludeFontPadding(boolean);















    method public void setInputExtras(int) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;










@@ -48174,7 +48174,7 @@ package android.widget {













    method public final void setTextKeepState(java.lang.CharSequence);















    method public final void setTextKeepState(java.lang.CharSequence, android.widget.TextView.BufferType);















    method public void setTextLocale(java.util.Locale);













    method public void setTextLocales(android.util.LocaleList);













    method public void setTextLocales(android.os.LocaleList);















    method public void setTextScaleX(float);















    method public void setTextSize(float);















    method public void setTextSize(int, float);

























core/java/android/app/ResourcesManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -29,10 +29,10 @@ import android.content.res.ResourcesImpl;













import android.content.res.ResourcesKey;















import android.hardware.display.DisplayManagerGlobal;















import android.os.IBinder;













import android.os.LocaleList;















import android.os.Trace;















import android.util.ArrayMap;















import android.util.DisplayMetrics;













import android.util.LocaleList;















import android.util.Log;















import android.util.Pair;















import android.util.Slog;

































core/java/android/content/res/Configuration.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -28,10 +28,10 @@ import android.annotation.Nullable;













import android.content.pm.ActivityInfo;















import android.content.pm.ActivityInfo.Config;















import android.os.Build;













import android.os.LocaleList;















import android.os.Parcel;















import android.os.Parcelable;















import android.text.TextUtils;













import android.util.LocaleList;















import android.view.View;































import java.io.IOException;