From 75ac728e0e35c7b4398c63893b91b22377a3332a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 13 Dec 2018 03:15:08 +0000 Subject: [PATCH] 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 --- .../settings/testutils/SettingsRobolectricTestRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index b3b3a8c6162..74914f4eb44 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 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { 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,