diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-15 15:53:17 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-15 22:06:10 -0800 |
commit | 7c74e4ae641e76f73d74348e293c244a157f6585 (patch) | |
tree | 52f84297787842137b3bd1818bc0d5f723d1e3ab /tests/src/com/android/launcher3/ui | |
parent | 338dee9dd7a7b087bf182f16970c16ffd940b435 (diff) | |
download | android_packages_apps_Trebuchet-7c74e4ae641e76f73d74348e293c244a157f6585.tar.gz android_packages_apps_Trebuchet-7c74e4ae641e76f73d74348e293c244a157f6585.tar.bz2 android_packages_apps_Trebuchet-7c74e4ae641e76f73d74348e293c244a157f6585.zip |
No more UserHandleCompat
Bug: 32745285
Change-Id: I762fb4e268c1afe48a1860ab12a4ccb3f626aa95
Diffstat (limited to 'tests/src/com/android/launcher3/ui')
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java b/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java index abe6b9591..4a80735bd 100644 --- a/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java +++ b/tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java @@ -1,5 +1,6 @@ package com.android.launcher3.ui; +import android.os.Process; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; @@ -7,7 +8,6 @@ import android.test.suitebuilder.annotation.LargeTest; import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.LauncherAppsCompat; -import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -24,7 +24,7 @@ public class AllAppsAppLaunchTest extends LauncherInstrumentationTestCase { super.setUp(); mSettingsApp = LauncherAppsCompat.getInstance(mTargetContext) - .getActivityList("com.android.settings", UserHandleCompat.myUserHandle()).get(0); + .getActivityList("com.android.settings", Process.myUserHandle()).get(0); } public void testAppLauncher_portrait() throws Exception { diff --git a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java index f45710c67..8837b0086 100644 --- a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java @@ -1,5 +1,6 @@ package com.android.launcher3.ui; +import android.os.Process; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; @@ -7,7 +8,6 @@ import android.test.suitebuilder.annotation.LargeTest; import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.LauncherAppsCompat; -import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -24,7 +24,7 @@ public class AllAppsIconToHomeTest extends LauncherInstrumentationTestCase { super.setUp(); mSettingsApp = LauncherAppsCompat.getInstance(mTargetContext) - .getActivityList("com.android.settings", UserHandleCompat.myUserHandle()).get(0); + .getActivityList("com.android.settings", Process.myUserHandle()).get(0); } public void testDragIcon_portrait() throws Throwable { diff --git a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java index f892e6349..02d938cb2 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java @@ -1,6 +1,7 @@ package com.android.launcher3.ui; import android.graphics.Point; +import android.os.Process; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; @@ -10,7 +11,6 @@ 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.compat.UserHandleCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -27,7 +27,7 @@ public class ShortcutsLaunchTest extends LauncherInstrumentationTestCase { super.setUp(); mSettingsApp = LauncherAppsCompat.getInstance(mTargetContext) - .getActivityList("com.android.settings", UserHandleCompat.myUserHandle()).get(0); + .getActivityList("com.android.settings", Process.myUserHandle()).get(0); } public void testAppLauncher_portrait() throws Exception { diff --git a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java index f9a0e6eaa..afe4832fd 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java @@ -1,6 +1,7 @@ package com.android.launcher3.ui; import android.graphics.Point; +import android.os.Process; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; @@ -10,7 +11,6 @@ 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.compat.UserHandleCompat; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; @@ -27,7 +27,7 @@ public class ShortcutsToHomeTest extends LauncherInstrumentationTestCase { super.setUp(); mSettingsApp = LauncherAppsCompat.getInstance(mTargetContext) - .getActivityList("com.android.settings", UserHandleCompat.myUserHandle()).get(0); + .getActivityList("com.android.settings", Process.myUserHandle()).get(0); } public void testDragIcon_portrait() throws Throwable { |