Not using Settings in TaplTestsLauncher3.testDragAppIcon

Settings frequently crashes

Bug: 126587956
Change-Id: Ied62d6f8783d8f0f9c434bdd8ee14c62d6cbc4c1
This commit is contained in:
vadimt
2019-04-04 17:35:57 -07:00
parent 24eb1c9c89
commit fb0cb7a26c
3 changed files with 12 additions and 4 deletions

View File

@@ -97,5 +97,13 @@
<category android:name="android.intent.category.LAUNCHER_APP" />
</intent-filter>
</activity>
<activity
android:name="com.android.launcher3.testcomponent.BaseTestingActivity"
android:label="LauncherTestApp">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>

View File

@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Color;
import android.os.Bundle;
import android.util.TypedValue;
import android.view.View;
@@ -63,6 +64,7 @@ public class BaseTestingActivity extends Activity implements View.OnClickListene
mView = new LinearLayout(this);
mView.setPadding(mMargin, mMargin, mMargin, mMargin);
mView.setOrientation(LinearLayout.VERTICAL);
mView.setBackgroundColor(Color.BLUE);
setContentView(mView);
registerReceiver(mCommandReceiver, new IntentFilter(mAction + SUFFIX_COMMAND));

View File

@@ -330,9 +330,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
public void testDragAppIcon() throws Throwable {
try {
TestProtocol.sDebugTracing = true;
LauncherActivityInfo settingsApp = getSettingsApp();
final String appName = settingsApp.getLabel().toString();
final String appName = "LauncherTestApp";
// 1. Open all apps and wait for load complete.
// 2. Drag icon to homescreen.
// 3. Verify that the icon works on homescreen.
@@ -341,7 +339,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
getAppIcon(appName).
dragToWorkspace().
getWorkspaceAppIcon(appName).
launch(settingsApp.getComponentName().getPackageName());
launch(getInstrumentation().getContext().getPackageName());
} finally {
TestProtocol.sDebugTracing = false;
}