summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-25am a71ff4c3: Merge in Android 4.4HEADandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1mastermainkitkat-devidea133-weekly-releaseidea133The Android Open Source Project
* commit 'a71ff4c34d708a2a130e5753e8ac966ddaa84c35':
2013-11-25am 34f0bc32: Merge remote-tracking branch \'origin/kitkat-dev\'Baligh Uddin
* commit '34f0bc324a145846e938b7737be0166dbf6b92fd': Initial empty repository
2013-11-24Merge in Android 4.4The Android Open Source Project
2013-11-21Merge "Changed clickAndWaitForNewWindow() to respect the timeout parameter"Allen Hair
2013-11-19Removed url from javadoc.Allen Hair
I believe this was added by mistake. Change-Id: I56fba7d3ec582d09530451053130616355ddc3f9
2013-11-19Changed clickAndWaitForNewWindow() to respect the timeout parameterAllen Hair
Also added some tests for this issue. Bug: 10916102 Change-Id: I5a71e32b9f98a374cfbd578302e0e60b89c8398c
2013-11-18Merge "Removed unnecessary synchronized block in findAccessibilityNodeInfo(..)"android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-mr1.1-releasekitkat-mr1-releaseAllen Hair
2013-11-15Fix build breakage. Changed api file to avoid collision with platform.Allen Hair
Change-Id: I1228b62cddc723f79267adec414561aa35787ded
2013-11-14Renamed targets to avoid collision with platform uiautomator.Allen Hair
Change-Id: Ia0fe97898722f371014d84c92259ee8b8166363f
2013-11-14Removed unnecessary synchronized block in findAccessibilityNodeInfo(..)Allen Hair
This fixes a deadlock that occurs when performing uiautomation against an app targeted by instrumentation. Change-Id: I113bbf3a3e7836ebb44c5b4e64e2db7edcecfc80
2013-11-01Merge remote-tracking branch 'origin/kitkat-dev'Baligh Uddin
2013-10-31Initial empty repositoryBaligh Uddin
2013-10-29Fixed testapp module tag to match CtsUiAutomatorTest.Allen Hair
Change-Id: I0284b5cf8093f392afded335f20648dba3ff2aa6
2013-10-25Port UiAutomator CTS test to the unbundled branch.Allen Hair
Copied test from cts/tests/uiautomator. Modified the code to use the instrumentation based uiautomator rather than shell based. Change-Id: I8db4ac24d64813aa58fda42abff7b81bcedf70f3
2013-10-23Merged core/ and testrunner/ into a single directory.Allen Hair
Source files do not need to be split up in the unbundled branch. Change-Id: I4ab82e111691a88b90265c2816fb902bbc8a3f8d
2013-10-22Setup Eclipse files for unbundled UI AutomatorGuang Zhu
Bug: 10793010 Change-Id: Iaca22c42e7014f1a9a9ce4f9a8335fb4a8467016
2013-10-08rename uiautomator module nameandroid-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9kitkat-releasekitkat-cts-releasekitkat-cts-devGuang Zhu
to avoid conflict with platform tree ...and temporarily break the build... Change-Id: I557a1570a6b432e86e2668e56a3e6ed866c2b477
2013-10-04Fixed UiDevice.dumpWindowHierarchy(..) to work under instrumentationAllen Hair
Filenames are now relative to the application's private internal storage directory. The previous location /data/local/tmp is not writable when running under instrumentation. Also changed the function to support absolute paths. Bug: 10788452 Change-Id: I2b797f3f6b820354b231b03395782f3e8e776519
2013-09-30FIRST!!!Guang Zhu
This should be the first build on unbundled UI Automator branch if all goes well... Bug: 10952315 Bug: 10793010 Change-Id: Iefae1a346cc958b2a8cdec131e48e03155db358a
2013-09-26makefile cleanup: don't build stubbed jarGuang Zhu
Bug: 10793010 Change-Id: I5dda0d22236c0bcf28a927d2b5104b6251511965
2013-09-26Merge "Revert "embed incremental build number in jar manifest""Guang Zhu
2013-09-26Revert "embed incremental build number in jar manifest"Guang Zhu
Using generated Java source file instead Bug: 10793010 This reverts commit 5aa8eb020f66efc930b068b57002d3975107593f. Change-Id: I563d15d6f0dc073300ce09863e36953a61974cc4
2013-09-26Generate BuildConstants.java and embed BUILD_NUMBER.Ying Wang
Change-Id: I8f282890ac5ee7cf40b4bac5a534bfd848947fa3
2013-09-25embed incremental build number in jar manifestGuang Zhu
Bug: 10793010 Change-Id: I35fec63ace4f05e37fa8004898084e89fad57412
2013-09-20makefile cleanGuang Zhu
* remove unused lines Bug: 10793010 Change-Id: I74843f6c4ee040cb6f2df8c0ff4c8a0168d6d93f
2013-09-19shuffling unbundled UI automator source codeGuang Zhu
* remove shell based UI automator code * port API checks from shell based to instrumentation based UI automator makefile * reorganize code structure Bug: 10793010 Change-Id: I936ded6c73f037fa15466b184826b14a1a204074
2013-09-17initial build environment for unbundled UI AutomatorGuang Zhu
Bug: 10793010 Change-Id: Ia52698ed2f90d9992a06433bba3045093ee7fa71
2013-09-12Merge uiautomator/ from platform/frameworks/testing to /Qiwen Zhao
2013-09-11Initial empty repositoryQiwen Zhao
2013-08-20am dba37a78: Tweak UI automator runner output formatGuang Zhu
* commit 'dba37a78454da33c43921dd289df3b9e8080ed8a': Tweak UI automator runner output format
2013-08-20Tweak UI automator runner output formatGuang Zhu
For uncaught exceptions, output exception message as shortMsg Change-Id: Ied019d3170a5afc9ebeab8251f66f69d9a9c2282
2013-08-20Fix master apps build.Ying Wang
Change-Id: Id4edfb2ccfad9d2dc8dbafdf6c15640242717468
2013-08-15Don't build uiautomator in unbundled app branches.Brett Chabot
Change-Id: I565c8ca27f670eb5a004a731f785f56712485255
2013-06-25am 3f7fd9e2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project
* commit '3f7fd9e2303c7b323c3f67ffbbae87f46587945d':
2013-06-25Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project
Change-Id: I88e6cf7ec1cc93a219e8227ad59aef4175ca64aa
2013-06-24merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger
2013-06-24Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEADThe Android Automerger
2013-06-21am 4dc84014: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project
* commit '4dc84014d0ff9bbdab05c683228f6c51d5fa218a':
2013-06-21Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project
Change-Id: I21300451f36b39b57e18be0c53503f03dba49648
2013-06-21merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger
2013-06-17am 78e50349: am 9ebf91aa: fix buildGuang Zhu
* commit '78e503499d4e4a9af449ab68e22f366b16139a0b': fix build
2013-06-17am 9ebf91aa: fix buildGuang Zhu
* commit '9ebf91aa923d2424298cb908a79dd03aefbf0a8f': fix build
2013-06-17fix buildGuang Zhu
Change-Id: I00868d5550c665340656fe1a4f20eaa3740ea50b
2013-06-17am 7cf09983: am 27862e05: Merge "docs: Edited Javadoc comments in ↵quddusc
uiautomator library source files (MR2)." into jb-mr2-dev * commit '7cf0998379b3c65410d932b7ab061f5fb92c7f2f': docs: Edited Javadoc comments in uiautomator library source files (MR2).
2013-06-17am 27862e05: Merge "docs: Edited Javadoc comments in uiautomator library ↵quddusc
source files (MR2)." into jb-mr2-dev * commit '27862e051fbf24ce200de0cc2fca7f7c3c62dec6': docs: Edited Javadoc comments in uiautomator library source files (MR2).
2013-06-17Merge "docs: Edited Javadoc comments in uiautomator library source files ↵quddusc
(MR2)." into jb-mr2-dev
2013-06-17docs: Edited Javadoc comments in uiautomator library source files (MR2).quddusc
Change-Id: I3eff0160ecb4769f2a7b26af68794f761dbd5cbc
2013-06-16am 62d574b1: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release ↵The Android Open Source Project
- do not merge * commit '62d574b17320bd4f74cddbd80094f3f1c82720fd': change verbose mode default to true and change param accordingly guard against use of UiDevice prior to its initialization
2013-06-16Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project
Change-Id: Ib57ae3808ebba85d86263457c2a92e899019d80a
2013-06-16merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 12:02:10 +0000