diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-01-05 15:22:41 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-01-11 13:06:50 -0800 |
commit | 3e9be43b6ea75c8b82b57aa58508a0c3e8e1d721 (patch) | |
tree | b61ddf897843b437ea3776dbe151588ab2a663eb /tests/src | |
parent | 87f784c285fdeed9091a4de8b9b44db3eca677d8 (diff) | |
download | android_packages_apps_Trebuchet-3e9be43b6ea75c8b82b57aa58508a0c3e8e1d721.tar.gz android_packages_apps_Trebuchet-3e9be43b6ea75c8b82b57aa58508a0c3e8e1d721.tar.bz2 android_packages_apps_Trebuchet-3e9be43b6ea75c8b82b57aa58508a0c3e8e1d721.zip |
No more LauncherActivityInfoCompat
Bug: 32745285
Change-Id: I00f13794d5dc0a2b1fe03ec74de36018f22eb386
Diffstat (limited to 'tests/src')
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index 73c90dade..9b7fc6ebf 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -3,6 +3,7 @@ package com.android.launcher3.model; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.pm.LauncherActivityInfo; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; @@ -23,7 +24,6 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherModel.BaseModelUpdateTask; import com.android.launcher3.LauncherModel.Callbacks; -import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.Provider; @@ -189,7 +189,7 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP @Override protected CacheEntry cacheLocked( @NonNull ComponentName componentName, - @NonNull Provider<LauncherActivityInfoCompat> infoProvider, + @NonNull Provider<LauncherActivityInfo> infoProvider, UserHandle user, boolean usePackageIcon, boolean useLowResIcon) { CacheEntry entry = mCache.get(new ComponentKey(componentName, user)); if (entry == null) { diff --git a/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java b/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java index 4a80735bd..0ced7cf33 100644 --- a/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java +++ b/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java @@ -1,12 +1,12 @@ package com.android.launcher3.ui; +import android.content.pm.LauncherActivityInfo; import android.os.Process; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; import android.test.suitebuilder.annotation.LargeTest; -import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -17,7 +17,7 @@ import com.android.launcher3.util.Wait; @LargeTest public class AllAppsAppLaunchTest extends LauncherInstrumentationTestCase { - private LauncherActivityInfoCompat mSettingsApp; + private LauncherActivityInfo mSettingsApp; @Override protected void setUp() throws Exception { diff --git a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java index 8837b0086..3f77bfdcd 100644 --- a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java @@ -1,12 +1,12 @@ package com.android.launcher3.ui; +import android.content.pm.LauncherActivityInfo; import android.os.Process; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; import android.test.suitebuilder.annotation.LargeTest; -import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -17,7 +17,7 @@ import com.android.launcher3.util.Wait; @LargeTest public class AllAppsIconToHomeTest extends LauncherInstrumentationTestCase { - private LauncherActivityInfoCompat mSettingsApp; + private LauncherActivityInfo mSettingsApp; @Override protected void setUp() throws Exception { diff --git a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java index 02d938cb2..c6828f064 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java @@ -1,5 +1,6 @@ package com.android.launcher3.ui; +import android.content.pm.LauncherActivityInfo; import android.graphics.Point; import android.os.Process; import android.support.test.uiautomator.By; @@ -9,7 +10,6 @@ import android.test.suitebuilder.annotation.LargeTest; import android.view.MotionEvent; import com.android.launcher3.R; -import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -20,7 +20,7 @@ import com.android.launcher3.util.Wait; @LargeTest public class ShortcutsLaunchTest extends LauncherInstrumentationTestCase { - private LauncherActivityInfoCompat mSettingsApp; + private LauncherActivityInfo mSettingsApp; @Override protected void setUp() throws Exception { diff --git a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java index afe4832fd..d573eeaec 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java @@ -1,5 +1,6 @@ package com.android.launcher3.ui; +import android.content.pm.LauncherActivityInfo; import android.graphics.Point; import android.os.Process; import android.support.test.uiautomator.By; @@ -9,7 +10,6 @@ import android.test.suitebuilder.annotation.LargeTest; import android.view.MotionEvent; import com.android.launcher3.R; -import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -20,7 +20,7 @@ import com.android.launcher3.util.Wait; @LargeTest public class ShortcutsToHomeTest extends LauncherInstrumentationTestCase { - private LauncherActivityInfoCompat mSettingsApp; + private LauncherActivityInfo mSettingsApp; @Override protected void setUp() throws Exception { |