diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-22 00:13:42 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-22 00:13:42 -0800 |
| commit | f1e484acb594a726fb57ad0ae4cfe902c7f35858 (patch) | |
| tree | 99d2b34512f0dc2ae67666e756c1cfcd331e5fe3 /core/java/android/text/TextUtils.java | |
| parent | 22f7dfd23490a3de2f21ff96949ba47003aac8f8 (diff) | |
| download | frameworks_base-f1e484acb594a726fb57ad0ae4cfe902c7f35858.zip frameworks_base-f1e484acb594a726fb57ad0ae4cfe902c7f35858.tar.gz frameworks_base-f1e484acb594a726fb57ad0ae4cfe902c7f35858.tar.bz2 | |
auto import from //branches/cupcake/...@127436
Diffstat (limited to 'core/java/android/text/TextUtils.java')
| -rw-r--r-- | core/java/android/text/TextUtils.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java index 64356d5..405d934 100644 --- a/core/java/android/text/TextUtils.java +++ b/core/java/android/text/TextUtils.java @@ -659,8 +659,8 @@ public class TextUtils { p.writeInt(0); } - p.writeInt(tas.getTextSize()); p.writeInt(tas.getTextStyle()); + p.writeInt(tas.getTextSize()); ColorStateList csl = tas.getTextColor(); if (csl == null) { @@ -799,8 +799,8 @@ public class TextUtils { p.readInt() != 0 ? p.readString() : null, - p.readInt(), - p.readInt(), + p.readInt(), // style + p.readInt(), // size p.readInt() != 0 ? ColorStateList.CREATOR.createFromParcel(p) : null, |