summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-04-21 10:53:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-21 10:53:08 -0700
commitca7f30ebb20dcf4c056f57a8c4ab3342cafaed83 (patch)
tree5204736b103f5455b8ccbde382e38ff96f35a867
parent1ccfd8ed7db0d6a8e9ac268baed060f0518cb4e5 (diff)
parentb8a57841316171d6db4311a65914720213516153 (diff)
downloadframeworks_base-ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83.zip
frameworks_base-ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83.tar.gz
frameworks_base-ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83.tar.bz2
am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit 'b8a57841316171d6db4311a65914720213516153': 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 72fa07c..47c2623 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> {
/**