commit 75ac728e0e35c7b4398c63893b91b22377a3332a
author Colin Cross <ccross@android.com> Thu Dec 13 03:15:08 2018 +0000
committer Colin Cross <ccross@android.com> Thu Dec 13 03:15:08 2018 +0000
tree 37af16dd3d449e176f59f783add71fde14a04ccf
parent ff8fca7d9eac8edea506d5b7c69f101b329176a3

Revert "Change LayoutPreference resource path in robo test"

This reverts commit ff8fca7d9eac8edea506d5b7c69f101b329176a3.

Reason for revert: broke build when combined with ag/5781147
Bug: 120706174

Change-Id: Id543bc3cb0b4979144e92c400e57988009f4c407

tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java

diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index b3b3a8c..74914f4 100644
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -86,7 +86,7 @@
             paths.add(new ResourcePath(null,
                     Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/ActionButtonsPreference/res")), null));
             paths.add(new ResourcePath(null,
-                    Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/LayoutPreference/res")), null));
+                    Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), null));
             paths.add(new ResourcePath(null,
                 Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null));
             paths.add(new ResourcePath(null,