summaryrefslogtreecommitdiff
path: root/android/testData/guiTests/CentralBuildDirectory/app/src/main/res/layout/activity_my.xml
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2014-08-08 15:00:01 -0700
committerAlex Ruiz <alruiz@google.com>2014-08-11 06:24:23 -0700
commit554a3eb27100e45adb24a74cdb2ccc55939bdea7 (patch)
treed88f036b7919b6891198833e15577fa43f72207b /android/testData/guiTests/CentralBuildDirectory/app/src/main/res/layout/activity_my.xml
parentb144cfadf082c871ce60650fef0244291b572c83 (diff)
downloadidea-554a3eb27100e45adb24a74cdb2ccc55939bdea7.tar.gz
Fixed bug where AssertionError was thrown for project with custom location of build folder.
The problem is that when locating the content root parent of the build folder, the check assumed that the folder was already created, which is not always the case. For example, when importing a project that has not been built, the build folder does not exist. In this CL we check that if the build folder does not exist, we use the URL of the folder specified in the content root to derive the path of the build folder, this way we can properly set up the project "excluded" folders during project sync. This CL also includes a UI test and a project that reproduces this issue: CentralBuildDirectoryTest and CentralBuildDirectory, respectively. Fixes issue https://code.google.com/p/android/issues/detail?id=74259 Change-Id: If3eedf43c6eb86581dec815e16486211ea10f196
Diffstat (limited to 'android/testData/guiTests/CentralBuildDirectory/app/src/main/res/layout/activity_my.xml')
-rw-r--r--android/testData/guiTests/CentralBuildDirectory/app/src/main/res/layout/activity_my.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/android/testData/guiTests/CentralBuildDirectory/app/src/main/res/layout/activity_my.xml b/android/testData/guiTests/CentralBuildDirectory/app/src/main/res/layout/activity_my.xml
new file mode 100644
index 00000000000..c17166f4d34
--- /dev/null
+++ b/android/testData/guiTests/CentralBuildDirectory/app/src/main/res/layout/activity_my.xml
@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ tools:context=".MyActivity">
+
+ <TextView
+ android:text="@string/hello_world"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+</RelativeLayout>