diff options
| -rw-r--r-- | res/values/styles.xml | 11 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 82b9819b5..56a205fd1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -41,21 +41,14 @@ <item name="android:background">@null</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item> - <item name="android:shadowRadius">2.0</item> - <item name="android:shadowDx">0</item> - <item name="android:shadowDy">2</item> - <item name="android:shadowColor">@color/quantum_panel_text_shadow_color</item> + <item name="android:shadowRadius">0</item> <item name="customShadows">false</item> </style> <style name="WorkspaceIcon.Folder"> <item name="android:background">@null</item> <item name="android:textColor">@color/quantum_panel_text_color</item> - <item name="android:shadowColor">@color/quantum_panel_text_shadow_color</item> - <item name="android:shadowRadius">2.0</item> - <item name="android:shadowDx">0</item> - <item name="android:shadowDy">2</item> - + <item name="android:shadowRadius">0</item> <item name="customShadows">false</item> </style> diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 924ed1158..e7c658acc 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3230,7 +3230,10 @@ public class Launcher extends Activity mAppsCustomizeTabHost.setContentTypeImmediate(contentType); } - if (animated) { + // If for some reason our views aren't initialized, don't animate + boolean initialized = getAllAppsButton() != null; + + if (animated && initialized) { mStateAnimation = LauncherAnimUtils.createAnimatorSet(); final AppsCustomizePagedView content = (AppsCustomizePagedView) toView.findViewById(R.id.apps_customize_pane_content); @@ -3457,7 +3460,10 @@ public class Launcher extends Activity toState, animated, layerViews); } - if (animated) { + // If for some reason our views aren't initialized, don't animate + boolean initialized = getAllAppsButton() != null; + + if (animated && initialized) { mStateAnimation = LauncherAnimUtils.createAnimatorSet(); if (workspaceAnim != null) { mStateAnimation.play(workspaceAnim); |