summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2018-08-27 17:36:03 -0700
committerTony Wickham <twickham@google.com>2018-08-27 17:36:03 -0700
commitcb3f87005486950817b266dd526d003cf0681bbb (patch)
tree198014fd7b62b44824c413612851c31f9b23e889 /src/com
parenta537578498da2b7e42a9636d9064d13df9703316 (diff)
downloadandroid_packages_apps_Trebuchet-cb3f87005486950817b266dd526d003cf0681bbb.tar.gz
android_packages_apps_Trebuchet-cb3f87005486950817b266dd526d003cf0681bbb.tar.bz2
android_packages_apps_Trebuchet-cb3f87005486950817b266dd526d003cf0681bbb.zip
Reading window_animation_scale from Settings.Global
It moved from Settings.System, so there were constant warnings in the logs. This only affects dogfood builds. Change-Id: Ic3c179837f78a8040579fcc6ad485f6fabe1c2a1
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/PagedView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 394b950c4..36b9e97aa 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1404,8 +1404,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
}
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);