diff options
author | Svetoslav <svetoslavganov@google.com> | 2014-09-04 15:39:54 -0700 |
---|---|---|
committer | Svetoslav <svetoslavganov@google.com> | 2014-09-05 10:07:02 -0700 |
commit | c7d62f02b8acfd0a6b31f8544ec2c07e780fe4bb (patch) | |
tree | 532c46292dac958aed9b688138a828f2e8da58ec /api | |
parent | d3cc74cac29c0534762228accf72ea8c6f5bebde (diff) | |
download | frameworks_base-c7d62f02b8acfd0a6b31f8544ec2c07e780fe4bb.zip frameworks_base-c7d62f02b8acfd0a6b31f8544ec2c07e780fe4bb.tar.gz frameworks_base-c7d62f02b8acfd0a6b31f8544ec2c07e780fe4bb.tar.bz2 |
Addressing API council comments for UserManager.
bug:17390424
Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 9 | ||||
-rw-r--r-- | api/removed.txt | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index e21bfb9..eb458f7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8843,6 +8843,9 @@ package android.content.pm { method public abstract android.content.pm.FeatureInfo[] getSystemAvailableFeatures(); method public abstract java.lang.String[] getSystemSharedLibraryNames(); method public abstract java.lang.CharSequence getText(java.lang.String, int, android.content.pm.ApplicationInfo); + method public abstract android.graphics.drawable.Drawable getUserBadgedDrawableForDensity(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); + method public abstract android.graphics.drawable.Drawable getUserBadgedIcon(android.graphics.drawable.Drawable, android.os.UserHandle); + method public abstract java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle); method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo); method public abstract boolean hasSystemFeature(java.lang.String); method public abstract boolean isSafeMode(); @@ -22465,9 +22468,6 @@ package android.os { public class UserManager { method public android.os.Bundle getApplicationRestrictions(java.lang.String); - method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); - method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle); - method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle); method public long getSerialNumberForUser(android.os.UserHandle); method public int getUserCount(); method public android.os.UserHandle getUserForSerialNumber(long); @@ -29741,6 +29741,9 @@ package android.test.mock { method public android.content.pm.FeatureInfo[] getSystemAvailableFeatures(); method public java.lang.String[] getSystemSharedLibraryNames(); method public java.lang.CharSequence getText(java.lang.String, int, android.content.pm.ApplicationInfo); + method public android.graphics.drawable.Drawable getUserBadgedDrawableForDensity(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); + method public android.graphics.drawable.Drawable getUserBadgedIcon(android.graphics.drawable.Drawable, android.os.UserHandle); + method public java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle); method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo); method public boolean hasSystemFeature(java.lang.String); method public boolean isSafeMode(); diff --git a/api/removed.txt b/api/removed.txt index a910e78..0aa6d54 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -30,6 +30,12 @@ package android.os { method public void wakeUp(long); } + public class UserManager { + method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); + method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle); + method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle); + } + } package android.service.notification { |