commit 1654c9e1c00cb41de392880adf7c3a5a558270b3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 28 18:07:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 28 18:07:17 2018 +0000
tree 8d39996c107a1cf721722b4d6d3392820b6dbc32
parent a42505c3856325ae3d34e9689ac6d17c43abee02
parent cb3f87005486950817b266dd526d003cf0681bbb

Merge "Reading window_animation_scale from Settings.Global" into ub-launcher3-master

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 394b950..36b9e97 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1404,8 +1404,8 @@
         }
 
         if (FeatureFlags.IS_DOGFOOD_BUILD) {
-            duration *= Settings.System.getFloat(getContext().getContentResolver(),
-                    Settings.System.WINDOW_ANIMATION_SCALE, 1);
+            duration *= Settings.Global.getFloat(getContext().getContentResolver(),
+                    Settings.Global.WINDOW_ANIMATION_SCALE, 1);
         }
 
         whichPage = validateNewPage(whichPage);