commit 906d731b11fa9352c51a1129ba18218cd3b4d656
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 13 02:11:59 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 13 02:11:59 2018 +0000
tree 453a6846015cda629ff2c008bd8030d6ecc5d97b
parent 91cc417bb098c32e22424e973cd6df58d6620c8f
parent ff8fca7d9eac8edea506d5b7c69f101b329176a3

Merge "Change LayoutPreference resource path in robo test"

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 6a17795..68db390 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/SettingsLayoutPreference/res")), null));
+                    Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/LayoutPreference/res")), null));
             paths.add(new ResourcePath(null,
                     Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null));
             paths.add(new ResourcePath(null,