diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 13:01:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-16 13:01:07 -0700 |
| commit | 9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3 (patch) | |
| tree | ea2228a72541ae74400c7b81226d9723a6e1cd9b /core/java | |
| parent | 1e662c3294b740ff694ad98e4d9a366e1e4b5e62 (diff) | |
| parent | 29735689cea7bf52998c1911542dcfdd1c1d9628 (diff) | |
| download | frameworks_base-9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3.zip frameworks_base-9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3.tar.gz frameworks_base-9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3.tar.bz2 | |
Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 4ac72fd..0de08f2 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -303,9 +303,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration public String toString() { StringBuilder sb = new StringBuilder(128); - sb.append("{ fnt="); + sb.append("{"); sb.append(fontScale); - sb.append(" imsi="); + sb.append("x imsi="); sb.append(mcc); sb.append("/"); sb.append(mnc); diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 2058991..03b3553 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -394,6 +394,12 @@ public interface WindowManagerPolicy { LocalPowerManager powerManager); /** + * Called by window manager once it has the initial, default native + * display dimensions. + */ + public void setInitialDisplaySize(int width, int height); + + /** * Check permissions when adding a window. * * @param attrs The window's LayoutParams. |