diff options
| author | Andrew Flynn <flynn@google.com> | 2012-05-18 13:56:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-18 13:56:45 -0700 |
| commit | 799e00f71df331d2e715b8f2c167f945b07511b9 (patch) | |
| tree | e2148d4c6b8102a4513e1afe8ca7dde4ea383c8c | |
| parent | 1d890971b4fa41b1d01f4967f5706497fa38fe58 (diff) | |
| parent | a743d3526f95680328145c43736442e29f92f39e (diff) | |
| download | android_packages_apps_Trebuchet-799e00f71df331d2e715b8f2c167f945b07511b9.tar.gz android_packages_apps_Trebuchet-799e00f71df331d2e715b8f2c167f945b07511b9.tar.bz2 android_packages_apps_Trebuchet-799e00f71df331d2e715b8f2c167f945b07511b9.zip | |
Merge "Use different cling for custom workspace" into jb-dev
| -rw-r--r-- | src/com/android/launcher2/Cling.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java index 797829846..d61b9883a 100644 --- a/src/com/android/launcher2/Cling.java +++ b/src/com/android/launcher2/Cling.java @@ -186,11 +186,12 @@ public class Cling extends FrameLayout { mDrawIdentifier.equals(ALLAPPS_LARGE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling2); } else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) || - mDrawIdentifier.equals(FOLDER_LANDSCAPE) || - mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { + mDrawIdentifier.equals(FOLDER_LANDSCAPE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling3); } else if (mDrawIdentifier.equals(FOLDER_LARGE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling4); + } else if (mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { + mBackground = getResources().getDrawable(R.drawable.bg_cling5); } } if (mBackground != null) { |