summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-04-21 10:51:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-21 10:51:14 -0700
commitb8a57841316171d6db4311a65914720213516153 (patch)
tree043b576e10c3bd19da624fecfda7e949646b99d6
parentd155e1a2d8768e383824c565a5b4f5a7546960ea (diff)
parent63848e3df3a87c111617a81ff3e1f2685de7b031 (diff)
downloadframeworks_base-b8a57841316171d6db4311a65914720213516153.zip
frameworks_base-b8a57841316171d6db4311a65914720213516153.tar.gz
frameworks_base-b8a57841316171d6db4311a65914720213516153.tar.bz2
Merge "docs: add a little info to Configuration class description" into honeycomb
-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 31119d7..d20fcf9 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> {
/**