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

Commit ddaf3f46 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Move LocaleList to avoid layering violation." into nyc-dev 

am: 31884efd

* commit '31884efd':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
parents ca5fd7ca 31884efd

api/current.txt

+29 −29
Original line number Diff line number Diff line
@@ -10114,14 +10114,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);
@@ -12033,7 +12033,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();
@@ -12089,7 +12089,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);
@@ -28673,6 +28673,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();










@@ -39212,11 +39230,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);










@@ -40235,24 +40253,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);










@@ -44651,7 +44651,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;










@@ -47938,7 +47938,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);










@@ -47977,7 +47977,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();










@@ -48045,7 +48045,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;










@@ -48091,7 +48091,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








@@ -10555,14 +10555,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);










@@ -12474,7 +12474,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();










@@ -12530,7 +12530,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);










@@ -31116,6 +31116,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();










@@ -42214,11 +42232,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);










@@ -43237,24 +43255,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);










@@ -47656,7 +47656,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;










@@ -51297,7 +51297,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);










@@ -51336,7 +51336,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();










@@ -51404,7 +51404,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;










@@ -51450,7 +51450,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








@@ -10127,14 +10127,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);










@@ -12046,7 +12046,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();










@@ -12102,7 +12102,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);










@@ -28742,6 +28742,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();










@@ -39291,11 +39309,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);










@@ -40314,24 +40332,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);










@@ -44730,7 +44730,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;










@@ -48017,7 +48017,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);










@@ -48056,7 +48056,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();










@@ -48124,7 +48124,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;










@@ -48170,7 +48170,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;