openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am a38dc901: Ensure all apps button inintialized before performing all apps transition 

* commit 'a38dc90188a6bee465b72e8383b36b264e30a08a':
  Ensure all apps button inintialized before performing all apps transition
This commit is contained in:
Adam Cohen 2014-09-08 11:30:47 +00:00 committed by Android Git Automerger
parent d64910c4d3 a38dc90188
commit 94e83e36dc
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/styles.xml
View File

@ -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>

10
src/com/android/launcher3/Launcher.java
View File

@ -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);