summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-04-21 10:59:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-21 10:59:33 -0700
commit52c03d2cb9a782366e804d1910a7c8f072b05353 (patch)
tree8cb07b4312d35fb5c28f6bea80f6e52d2e9a1013
parent1cc1a41b5a095c2eae556c9be0a7ad3f2fc5bfbb (diff)
parenta23ae0d7be890b7590a87891b894a30f25bbd3ef (diff)
downloadframeworks_base-52c03d2cb9a782366e804d1910a7c8f072b05353.zip
frameworks_base-52c03d2cb9a782366e804d1910a7c8f072b05353.tar.gz
frameworks_base-52c03d2cb9a782366e804d1910a7c8f072b05353.tar.bz2
am a23ae0d7: am 69ccfd7a: am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit 'a23ae0d7be890b7590a87891b894a30f25bbd3ef': docs: add a little info to Configuration class description
-rw-r--r--core/java/android/content/res/Configuration.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index b9dfd72..ad48786 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -26,7 +26,11 @@ import java.util.Locale;
* This class describes all device configuration information that can
* impact the resources the application retrieves. This includes both
* user-specified configuration options (locale and scaling) as well
- * as dynamic device configuration (various types of input devices).
+ * as device configurations (such as input modes, screen size and screen orientation).
+ * <p>You can acquire this object from {@link Resources}, using {@link
+ * Resources#getConfiguration}. Thus, from an activity, you can get it by chaining the request
+ * with {@link android.app.Activity#getResources}:</p>
+ * <pre>Configuration config = getResources().getConfiguration();</pre>
*/
public final class Configuration implements Parcelable, Comparable<Configuration> {
/**