Guang Zhu
e9a60f3c8e
am 8749a298: fix how monkey adjust timestamps for motion events
...
* commit '8749a298c0a94df8fc511bdd08fef4a59d0fadf7':
fix how monkey adjust timestamps for motion events
2012-05-01 16:11:17 -07:00
Trevor Johns
c3a688b27d
am 5cee3da1: am b2c1343d: Merge "Changes in some of the Android samples to support Google TV"
...
* commit '5cee3da1342301d1f3766a210416af4c510dd480':
Changes in some of the Android samples to support Google TV
2012-05-01 15:34:52 -07:00
Trevor Johns
5cee3da134
am b2c1343d: Merge "Changes in some of the Android samples to support Google TV"
...
* commit 'b2c1343d418a034309bdd14db16bf669de394c98':
Changes in some of the Android samples to support Google TV
2012-05-01 15:33:10 -07:00
Guang Zhu
8749a298c0
fix how monkey adjust timestamps for motion events
...
Currently for motion events, monkey forces current system uptime
onto both down time and event time. This breaks ACTION_MOVE
events because the down time of it is supposed to be the time
when finger is down.
the new logic is:
* check down time, if it's invalid (<0), fill in uptime
* always update event time with a fresh uptime
Bug: 6424997
Change-Id: I0b445815a5015d48c08bebc921c572164874449d
2012-05-01 13:57:57 -07:00
Trevor Johns
b2c1343d41
Merge "Changes in some of the Android samples to support Google TV"
2012-05-01 13:02:01 -07:00
The Android Automerger
ce4a642511
merge in jb-release history after reset to jb-dev
2012-04-30 07:00:27 -07:00
Robert Greenwalt
8449a7ce97
am 909ec2e1: Merge "Submit fixed script." into jb-dev
...
* commit '909ec2e1ae92618d5fd351cc23ee55f5693ab532':
Submit fixed script.
2012-04-27 11:57:24 -07:00
Robert Greenwalt
909ec2e1ae
Merge "Submit fixed script." into jb-dev
2012-04-27 11:55:27 -07:00
Robert Greenwalt
9089c7d7e5
Submit fixed script.
...
Not completely right - seems gubuntu/ubuntu both get unhappy after running
with the 'bridge' option and the PC's routes get hosed (right after the
script is run all is fine, but some agent then removes the routes on the
bridged iface and sets up routes on the native iface (eth0) and things on
the PC lose net access. Note that you can manually reset the routes and make
it happy again).
The fix I applied to the script was related to turning on rndis on the device
and setting device side dns servers correctly so my 'fix' is not responsible
for the eventual unhappniess on the PC. Also, the rev-tether continues
to work fine even when the PC is unhappy, so this may be useful.
Perhaps somebody can figure out who is changing the pc routes and why.
bug:4208971
Change-Id: I6ef6a88c71779b2083dad26a4be35ff74c26aae4
2012-04-27 10:45:07 -07:00
Dianne Hackborn
833019656d
am 9cd16548: Add API demo for Activity.finishAffinity().
...
* commit '9cd165488b9ab08d7fae140e3f13dbceecc9d58b':
Add API demo for Activity.finishAffinity().
2012-04-26 19:27:48 -07:00
Dianne Hackborn
9cd165488b
Add API demo for Activity.finishAffinity().
...
Also fix text on some of the existing demos to use the nice
larger font.
Change-Id: I90d3815cd47cda08217cfc6307d64942f6750ae2
2012-04-26 18:57:13 -07:00
Jeff Brown
0b28341b2d
Fix Monkey key events.
...
Monkey should not be injecting keys with metastate of -1.
Cleaned up the code to ensure it doesn't happen and to make it more
obvious what's going on.
Bug: 6397645
Change-Id: I7339b2fe14edb0578005f93af1f803a0ae3dec96
2012-04-26 18:48:47 -07:00
Jeff Brown
27e9f46d46
am 791babef: Merge "Fix Monkey key events." into jb-dev
...
* commit '791babeffccae04aace73fea4b09d59a8e1a0a92':
Fix Monkey key events.
2012-04-26 13:53:10 -07:00
Jeff Brown
791babeffc
Merge "Fix Monkey key events." into jb-dev
2012-04-26 13:51:08 -07:00
Jeff Brown
f63ed9b83c
Fix Monkey key events.
...
Monkey should not be injecting keys with metastate of -1.
Cleaned up the code to ensure it doesn't happen and to make it more
obvious what's going on.
Bug: 6397645
Change-Id: I7339b2fe14edb0578005f93af1f803a0ae3dec96
2012-04-26 12:11:50 -07:00
James Dong
05bbfd06c5
am d71b64f6: Added software mpeg4 and h263 video encoder to sdk/emulator build
...
* commit 'd71b64f6c1503b1b3769dcaf76c2fa7a11de7492':
Added software mpeg4 and h263 video encoder to sdk/emulator build
2012-04-26 11:58:21 -07:00
The Android Automerger
1abd31629e
merge in jb-release history after reset to jb-dev
2012-04-26 07:00:16 -07:00
James Dong
d71b64f6c1
Added software mpeg4 and h263 video encoder to sdk/emulator build
...
o related-to-bug: 6401068
Change-Id: If0711b68e1f6be88b123fc8117be970c87bc1d8f
2012-04-25 18:12:43 -07:00
Kartic Grover
08bbdb6b21
Changes in some of the Android samples to support Google TV
...
Made changes in manifest files for 3 Android samples, namely ActionBarCompat, BackupRestore and CrossCompatibility for supporting Google TV devices. Changes related to making touchscreen support as optional and adding support for large screen devices was added.
Change-Id: Ie49b6fe94d750304b249b154b4bd9dffc3f789ee
2012-04-25 16:52:12 -07:00
Raphael Moll
e83c267f4b
am 5b9f9e28: am 424c95da: Merge "SDK: Update sdk product library dependency list"
...
* commit '5b9f9e2852dfecedde177fce0fa5206e8cba249f':
SDK: Update sdk product library dependency list
2012-04-25 15:59:49 -07:00
Raphael Moll
5b9f9e2852
am 424c95da: Merge "SDK: Update sdk product library dependency list"
...
* commit '424c95da4b3a413c1dae1c270437001ea203cbf3':
SDK: Update sdk product library dependency list
2012-04-25 15:57:51 -07:00
Raphael Moll
424c95da4b
Merge "SDK: Update sdk product library dependency list"
2012-04-25 15:07:43 -07:00
James Dong
b0226c9d1d
am 1632bc61: Added software h264 video encoder for emulator/sdk build
...
* commit '1632bc614d42e1997472b48ab19c347a04f80516':
Added software h264 video encoder for emulator/sdk build
2012-04-25 14:11:43 -07:00
Raphael Moll
8e706a7f50
am e5a8435b: am a70fac3d: Merge "SDK: update product sdk.mk"
...
* commit 'e5a8435b42fff6080be9bebdf754cfd9f9dff150':
SDK: update product sdk.mk
2012-04-25 13:52:46 -07:00
James Dong
1632bc614d
Added software h264 video encoder for emulator/sdk build
...
o related-to-bug: 6383440
Change-Id: I0abf595cd1cabd0be6d05bc9250c90300149f16b
2012-04-25 13:51:56 -07:00
Raphael Moll
e5a8435b42
am a70fac3d: Merge "SDK: update product sdk.mk"
...
* commit 'a70fac3d09705d03cf7b2e98340b174424f54b5a':
SDK: update product sdk.mk
2012-04-25 13:50:26 -07:00
Raphael Moll
a70fac3d09
Merge "SDK: update product sdk.mk"
2012-04-25 10:23:13 -07:00
The Android Automerger
35ec2a8f72
merge in jb-release history after reset to jb-dev
2012-04-25 07:47:14 -07:00
Xavier Ducrohet
f7f09951dc
am befd4ca9: (-s ours) am faa031ab: (-s ours) Fix GridLayout in support library. do not merge.
...
* commit 'befd4ca938188182729ca31015a8fe5a75f7c93f':
Fix GridLayout in support library. do not merge.
2012-04-24 22:48:00 -07:00
Michael Jurka
e0d0b6cee4
Merge "No longer using bindAppWidgetId"
2012-04-24 19:06:20 -07:00
Xavier Ducrohet
befd4ca938
am faa031ab: (-s ours) Fix GridLayout in support library. do not merge.
...
* commit 'faa031ab689f44a269a69ebfbcd49d9937d0fdc6':
Fix GridLayout in support library. do not merge.
2012-04-24 18:50:36 -07:00
Michael Jurka
d5296c80e2
No longer using bindAppWidgetId
2012-04-24 18:21:05 -07:00
Xavier Ducrohet
faa031ab68
Fix GridLayout in support library. do not merge.
...
layout_marginStart/End are not in earlier api and are
not used by GridLayout anyway.
Make sure the .classpath/.project are copied (atree ignores
hidden files).
Change-Id: Iddbd223af7ed06e81c6e64b135e28e789c01da79
2012-04-24 17:02:19 -07:00
Raphael Moll
feaa5e8fbe
SDK: Update sdk product library dependency list
...
Change-Id: I4830e7eac1192360a0a9850f763f98063b2c266f
2012-04-24 17:01:20 -07:00
Xavier Ducrohet
8427f0fcc6
Merge "Fix GridLayout copy into the SDK."
2012-04-24 16:49:43 -07:00
Xavier Ducrohet
3c3cb4687e
Fix GridLayout copy into the SDK.
...
Typo in a dest file name.
Change-Id: I862f19f87608d1643097ee91ce5eaf64e05800d0
2012-04-24 16:46:29 -07:00
Raphael Moll
fa6183c396
SDK: update product sdk.mk
...
The target/product/sdk.mk was split out of build.git.
Now this moves a few dependencies that were listed into the sdk.git
version of this file by mistake. Also sort the entries to be more
readable.
Change-Id: I652bca2b0322e9e8efd4bf2d5d9fcfd6c86d9c6c
2012-04-24 16:30:39 -07:00
Xavier Ducrohet
4da8c59102
am d77109de: (-s ours) am 53e3c7d8: am 805b1690: Move support library to r8. do not merge.
...
* commit 'd77109def0b7b7fe3fadaca9bdadd19f01356535':
2012-04-24 15:55:17 -07:00
Xavier Ducrohet
923feb2132
am 5e40f4e2: (-s ours) am 42cbe355: am 805b1690: Move support library to r8. do not merge.
...
* commit '5e40f4e2dfbfdddccc40e538f9eae1737883a3e5':
2012-04-24 15:55:16 -07:00
Raphael Moll
cf41a76a32
am 931eb3a4: am 497c9183: am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list."
...
* commit '931eb3a4005cb8419d7fbc85217ea8a074f39388':
Support for Windows SDK pre-requisite module list.
2012-04-24 15:54:41 -07:00
Robert Ly
6db39f75e3
am 4b8b7526: am 41ab7fd7: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '4b8b75264ebbedf80e94d489ad3b591f230283ef':
2012-04-24 15:19:24 -07:00
Robert Ly
b6a5c7dadc
am 13a08689: am f6199950: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '13a086893acdc35ea75802271bbb9bb7a3693a18':
2012-04-24 15:19:23 -07:00
Raphael Moll
184eca2208
am 56b07781: am a5965405: am 186f007a: Merge "Split build/targets/product/sdk.mk"
...
* commit '56b077812c0f38d3bace893639a882c7807b040b':
Split build/targets/product/sdk.mk
2012-04-24 15:18:50 -07:00
Andrew Hsieh
47c3434ebd
am c7d65053: am 9de85641: am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>"
...
* commit 'c7d6505358925308c706be7b84764b392f19b8dd':
Fixed compilation error #include <android/*h>
2012-04-24 14:27:23 -07:00
Xavier Ducrohet
d77109def0
am 53e3c7d8: am 805b1690: Move support library to r8. do not merge.
...
* commit '53e3c7d833045f56624e09c4cf1ff4650e1ba6fe':
2012-04-24 14:26:07 -07:00
Xavier Ducrohet
42b5d6609d
am bf4cbbe4: (-s ours) am 805b1690: (-s ours) Move support library to r8. do not merge.
...
* commit 'bf4cbbe4c6c252d483f194d5efbf33270f1c6bea':
Move support library to r8. do not merge.
2012-04-24 14:25:49 -07:00
Xavier Ducrohet
5e40f4e2df
am 42cbe355: am 805b1690: Move support library to r8. do not merge.
...
* commit '42cbe3559b59483383e66f4bff95a2c073da835d':
Move support library to r8. do not merge.
2012-04-24 14:24:07 -07:00
Xavier Ducrohet
bf4cbbe4c6
am 805b1690: (-s ours) Move support library to r8. do not merge.
...
* commit '805b1690679072a6295ff073d4b233e069d8b49b':
Move support library to r8. do not merge.
2012-04-24 14:22:23 -07:00
Xavier Ducrohet
53e3c7d833
am 805b1690: Move support library to r8. do not merge.
...
* commit '805b1690679072a6295ff073d4b233e069d8b49b':
Move support library to r8. do not merge.
2012-04-24 14:22:18 -07:00
Xavier Ducrohet
42cbe3559b
am 805b1690: Move support library to r8. do not merge.
...
* commit '805b1690679072a6295ff073d4b233e069d8b49b':
Move support library to r8. do not merge.
2012-04-24 14:21:33 -07:00