summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-07-11 21:16:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-11 21:16:33 +0000
commit6f21ff341b92f4ad9ad5516da387b64822dc1441 (patch)
treefeff7ba221efa61876c9926312bf0ab95fd44aae /tests/src
parentc9b6d8432837c578b602a0d779bc425db27cb42e (diff)
parent819e1936bba39219a8fb2ceef5d172ca667e6658 (diff)
downloadandroid_packages_apps_Trebuchet-6f21ff341b92f4ad9ad5516da387b64822dc1441.tar.gz
android_packages_apps_Trebuchet-6f21ff341b92f4ad9ad5516da387b64822dc1441.tar.bz2
android_packages_apps_Trebuchet-6f21ff341b92f4ad9ad5516da387b64822dc1441.zip
Merge "Defining the list of predefined device profiles in xml. This allows the profiles to be easily customized by derivatives." into ub-launcher3-calgary
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/launcher3/InvariantDeviceProfileTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/src/com/android/launcher3/InvariantDeviceProfileTest.java b/tests/src/com/android/launcher3/InvariantDeviceProfileTest.java
index 35f686f55..230d623e9 100644
--- a/tests/src/com/android/launcher3/InvariantDeviceProfileTest.java
+++ b/tests/src/com/android/launcher3/InvariantDeviceProfileTest.java
@@ -41,7 +41,7 @@ public class InvariantDeviceProfileTest extends AndroidTestCase {
protected void setUp() throws Exception {
super.setUp();
mInvariantProfile = new InvariantDeviceProfile(getContext());
- mPredefinedDeviceProfiles = mInvariantProfile.getPredefinedDeviceProfiles();
+ mPredefinedDeviceProfiles = mInvariantProfile.getPredefinedDeviceProfiles(getContext());
}
@Override