tools/adt/idea.git -

Age	Commit message (Collapse)	Author
2013-08-29	Merge remote-tracking branch 'aosp/upstream-master' into merge-upstream	Tor Norbye
	Conflicts: android/src/org/jetbrains/android/run/testing/AndroidTestConfigurationProducer.java Change-Id: I1f85043c397b543fe25e27cea91115fcfa3e19ce
2013-08-28	IDEA-112694 support navigation from Manifest.* reference in Java to related ↵	Eugene Kudelevsky
	declaration in manifest
2013-08-23	Merge remote-tracking branch 'aosp/upstream-master' into merge-upstream	Tor Norbye
	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
2013-08-23	tests	Eugene Kudelevsky

2013-08-23	support navigation from "android.R.*" references to system resources	Eugene Kudelevsky

2013-07-03	Optimise the XML file format and refactor.	Philip Milne
	Include test to: 1. Create a Navigation Model 2. Serialise it to XML 3. Read the resulting XML 4. Serialise the resulting model 5. Assert character by character equivalence between the two XML files Change-Id: I51faf31531478210af8bab0348534847670e1d64
2013-06-11	Base NavigationEditor on the class names of Fragment/Activities rather than ↵	Philip Milne
	resource (XML) files. Change XMLReader and XMLWriter to accomodate cycles (using standard id & idref attributes). Change-Id: I9d41fc241e6ef90ae3878b7bf1e01fac2db1bf45
2013-05-31	First cut of Navigation Editor	Philip Milne
	Change-Id: Id93db904c3891642eda6617facbf69236b357baf
2012-07-26	fix: normalize delimiters of resource name keys in AndroidValueResourcesIndex	Eugene Kudelevsky

2012-06-25	merge with master	Evgeny Pasynkov

2012-06-20	remove duplicating R file from test data	Eugene Kudelevsky

2012-06-18	android augment: bug fixes, update rename tests	Eugene Kudelevsky

2012-04-23	PNG resources repack	Vassiliy Kudryashov

2012-02-13	android: navigation from java to resource should work even if related R ↵	Eugene Kudelevsky
	class field cannot be resolved
2010-10-18	android -> community	Maxim.Mossienko