diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-26 15:25:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-26 15:25:18 -0700 |
| commit | adf840ea0c41493fba9c4421918de080a2cfe71a (patch) | |
| tree | 77b1778c0960b563a676cd083961310f7868120e /packages | |
| parent | 2d38cc80afface3fcc5371e358e1d9a98c8b7aca (diff) | |
| parent | f834dfabbcbbe1f209682f18c67f2e8b9d3e1dd7 (diff) | |
| download | frameworks_base-adf840ea0c41493fba9c4421918de080a2cfe71a.zip frameworks_base-adf840ea0c41493fba9c4421918de080a2cfe71a.tar.gz frameworks_base-adf840ea0c41493fba9c4421918de080a2cfe71a.tar.bz2 | |
Merge "ClipDescription no longer inherits from ClipData."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java index 10b52f2..7ee3c19 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java @@ -116,7 +116,7 @@ public class ShirtPocket extends FrameLayout { mClipping = clipping; if (mClipping != null) { Bitmap icon = mClipping.getIcon(); - mDescription.setText(mClipping.getLabel()); + mDescription.setText(mClipping.getDescription().getLabel()); if (icon != null) { mPreviewIcon.setImageBitmap(icon); mPreviewIcon.setVisibility(View.VISIBLE); |