Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f5fab14 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change LayoutPreference resource path in robo test""

parents 906d731b 75ac728e

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

+1 −1
Original line number Diff line number Diff line
@@ -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,