diff options
| author | Andy Stadler <> | 2009-04-10 16:24:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 16:24:47 -0700 |
| commit | f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 (patch) | |
| tree | 1dd68eeddbfa83d571a3544d6d2e25ba9be21b49 /core/java/android/content | |
| parent | 1eb75a0b3770177c3f0d0c2e843f80fc34451ef5 (diff) | |
| download | frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.zip frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.gz frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.bz2 | |
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Intent.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 5 | ||||
| -rw-r--r-- | core/java/android/content/res/Resources.java | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 429c060..2b6cded 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1407,7 +1407,6 @@ public class Intent implements Parcelable { /** * Broadcast Action: An input method has been changed. - * {@hide pending API Council approval} */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_INPUT_METHOD_CHANGED = diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 7e4b7ac..956b15a 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -35,8 +35,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration public Locale locale; /** - * Locale should persist on setting - * @hide pending API council approval + * Locale should persist on setting. This is hidden because it is really + * questionable whether this is the right way to expose the functionality. + * @hide */ public boolean userSetLocale; diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 1a963f6..e020462 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -756,7 +756,7 @@ public class Resources { /** * Open a data stream for reading a raw resource. This can only be used - * with resources whose value is the name of an asset files -- that is, it can be + * with resources whose value is the name of an asset file -- that is, it can be * used to open drawable, sound, and raw resources; it will fail on string * and color resources. * @@ -766,8 +766,6 @@ public class Resources { * @return InputStream Access to the resource data. * * @throws NotFoundException Throws NotFoundException if the given ID does not exist. - * - * @hide Pending API council approval */ public InputStream openRawResource(int id, TypedValue value) throws NotFoundException { getValue(id, value, true); |