diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-08-23 09:31:17 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-08-23 09:31:17 -0700 |
| commit | 653238debc8eb97ae00dadb491ad9e4f892e2a05 (patch) | |
| tree | bb9f3f90b70f0656972c243f8a400edda9dee221 /android/testData/resNavigation | |
| parent | 49addf3699a2caa7e42fa387251e4422cf497e8f (diff) | |
| parent | 1e10f29be58767b77b682af710fa2d702055ef01 (diff) | |
| download | idea-653238debc8eb97ae00dadb491ad9e4f892e2a05.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge-upstream
Conflicts:
android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleBuilder.java
android/src/com/android/tools/idea/gradle/project/GradleProjectImporter.java
Change-Id: I5f490c9f597554b442d93f49d1f9e70b6af471b6
Diffstat (limited to 'android/testData/resNavigation')
5 files changed, 35 insertions, 0 deletions
diff --git a/android/testData/resNavigation/src/p1/p2/JavaFileNavigation13.java b/android/testData/resNavigation/src/p1/p2/JavaFileNavigation13.java new file mode 100644 index 00000000000..b0c16cfcac8 --- /dev/null +++ b/android/testData/resNavigation/src/p1/p2/JavaFileNavigation13.java @@ -0,0 +1,7 @@ +package p1.p2; + +class Java { + public void g() { + int a = R.id.id<caret>20; + } +}
\ No newline at end of file diff --git a/android/testData/resNavigation/src/p1/p2/JavaFileNavigation14.java b/android/testData/resNavigation/src/p1/p2/JavaFileNavigation14.java new file mode 100644 index 00000000000..5379fdfd4d2 --- /dev/null +++ b/android/testData/resNavigation/src/p1/p2/JavaFileNavigation14.java @@ -0,0 +1,7 @@ +package p1.p2; + +class Java { + public void g() { + int a = R.attr.att<caret>r2; + } +}
\ No newline at end of file diff --git a/android/testData/resNavigation/src/p1/p2/JavaFileNavigation15.java b/android/testData/resNavigation/src/p1/p2/JavaFileNavigation15.java new file mode 100644 index 00000000000..aab634ae4c8 --- /dev/null +++ b/android/testData/resNavigation/src/p1/p2/JavaFileNavigation15.java @@ -0,0 +1,7 @@ +package p1.p2; + +class Java { + public void g() { + int a = R.styleable.Dec<caret>1; + } +}
\ No newline at end of file diff --git a/android/testData/resNavigation/src/p1/p2/JavaFileNavigationToSystemResource1.java b/android/testData/resNavigation/src/p1/p2/JavaFileNavigationToSystemResource1.java new file mode 100644 index 00000000000..10571305401 --- /dev/null +++ b/android/testData/resNavigation/src/p1/p2/JavaFileNavigationToSystemResource1.java @@ -0,0 +1,7 @@ +package p1.p2; + +class Java { + public void g() { + int a = android.R.string.canc<caret>el; + } +}
\ No newline at end of file diff --git a/android/testData/resNavigation/src/p1/p2/JavaFileNavigationToSystemResource2.java b/android/testData/resNavigation/src/p1/p2/JavaFileNavigationToSystemResource2.java new file mode 100644 index 00000000000..565a552f6ab --- /dev/null +++ b/android/testData/resNavigation/src/p1/p2/JavaFileNavigationToSystemResource2.java @@ -0,0 +1,7 @@ +package p1.p2; + +class Java { + public void g() { + int a = android.R.id.checkbo<caret>x; + } +}
\ No newline at end of file |