PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure all apps button inintialized before performing all apps transition

Browse Source 
-> Also removing text shadows in all apps and folders (bug 16955157)

Bug 17400227

Change-Id: I67d361a7a1cb548c9caca4214621607feaef963a
This commit is contained in:
Adam Cohen
2014-09-07 17:48:55 +02:00
parent cd1452859d
commit a38dc90188
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values/styles.xml
+2 -9
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>
src/com/android/launcher3/Launcher.java
+8 -2
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);