diff options
| author | Winson Chung <winsonc@google.com> | 2011-04-14 16:08:02 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-04-22 12:53:59 -0700 |
| commit | 785d2eb2b8d7072c8124300dd9168ff51a91cf38 (patch) | |
| tree | a87bc934f8496b2dead1e508260d88c978a038ce /src/com/android/launcher2/PagedViewWidget.java | |
| parent | f579b5041afe8272c79f9f13001120d37eeeee7b (diff) | |
| download | android_packages_apps_Trebuchet-785d2eb2b8d7072c8124300dd9168ff51a91cf38.tar.gz android_packages_apps_Trebuchet-785d2eb2b8d7072c8124300dd9168ff51a91cf38.tar.bz2 android_packages_apps_Trebuchet-785d2eb2b8d7072c8124300dd9168ff51a91cf38.zip | |
Initial changes to merged AllApps/Customize pane in the Phone UI.
Change-Id: Ifa1676736033fe617dd0cca965156c38fa452948
Diffstat (limited to 'src/com/android/launcher2/PagedViewWidget.java')
| -rw-r--r-- | src/com/android/launcher2/PagedViewWidget.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java index c2d609e13..2dcceaea0 100644 --- a/src/com/android/launcher2/PagedViewWidget.java +++ b/src/com/android/launcher2/PagedViewWidget.java @@ -154,14 +154,15 @@ public class PagedViewWidget extends LinearLayout implements Checkable { // Set up fade in/out constants final Resources r = context.getResources(); - final int alpha = r.getInteger(R.integer.icon_allAppsCustomizeFadeAlpha); + final int alpha = r.getInteger(R.integer.config_dragAppsCustomizeIconFadeAlpha); if (alpha > 0) { - mCheckedAlpha = r.getInteger(R.integer.icon_allAppsCustomizeFadeAlpha) / 256.0f; - mCheckedFadeInDuration = r.getInteger(R.integer.icon_allAppsCustomizeFadeInTime); - mCheckedFadeOutDuration = r.getInteger(R.integer.icon_allAppsCustomizeFadeOutTime); + mCheckedAlpha = r.getInteger(R.integer.config_dragAppsCustomizeIconFadeAlpha) / 256.0f; + mCheckedFadeInDuration = + r.getInteger(R.integer.config_dragAppsCustomizeIconFadeInDuration); + mCheckedFadeOutDuration = + r.getInteger(R.integer.config_dragAppsCustomizeIconFadeOutDuration); } - setFocusable(true); setWillNotDraw(false); setClipToPadding(false); } |