27017 Commits

Author SHA1 Message Date
Jack Palevich
e23beed032 Merge "Keep screen on for whole test." 2010-07-19 17:02:26 -07:00
Jack Palevich
9778f9fc0e Keep screen on for whole test.
Print only one set of timings per test.

Draw blank black screen when done.

Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
2010-07-19 17:01:25 -07:00
Jamie Gennis
39c186dd91 am 98f8e0cb: am ff7049ab: Remove some debug logging that I accidentally committed.
Merge commit '98f8e0cbaa19b4a045e6f201290e731ddfad67ba'

* commit '98f8e0cbaa19b4a045e6f201290e731ddfad67ba':
  Remove some debug logging that I accidentally committed.
2010-07-19 16:35:26 -07:00
Jamie Gennis
98f8e0cbaa am ff7049ab: Remove some debug logging that I accidentally committed.
Merge commit 'ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp

* commit 'ff7049ab2886acc73e145367118646f7741ce333':
  Remove some debug logging that I accidentally committed.
2010-07-19 16:33:11 -07:00
Jack Palevich
9e3d49046e Merge "An application version of the GL test." 2010-07-19 16:28:56 -07:00
Jack Palevich
c954115596 An application version of the GL test.
Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
2010-07-19 16:27:54 -07:00
Mike Lockwood
2ef1cea440 Merge "Add support for emulating external storage on devices with no SD card" 2010-07-19 16:09:40 -07:00
Jamie Gennis
ff7049ab28 Remove some debug logging that I accidentally committed.
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
2010-07-19 16:09:26 -07:00
Winson Chung
121d7d86d2 Merge "Fixing build breakage due to misnamed javadoc variable." 2010-07-19 16:07:33 -07:00
Winson Chung
95362595ed Fixing build breakage due to misnamed javadoc variable.
Change-Id: I883a53107d2c0fcd4544c85811aeaad3fc4f13c2
2010-07-19 16:05:50 -07:00
Ying Wang
bc8112fd6d .rs files are now built by the build system.
Change-Id: Iba28bed6cc05883a28a59b8dd0ff12e1bfbe0c04
2010-07-19 16:01:44 -07:00
Christian Mehlmauer
798e2d3d0c Replaced /sdcard with Environment.getExternalStorageDirectory()
Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
2010-07-19 15:54:40 -07:00
Adam Powell
16ba106de5 Merge "Fix docs for MenuItem#setShowAsAction" 2010-07-19 15:52:02 -07:00
Adam Powell
ec66a3a9e0 Fix docs for MenuItem#setShowAsAction
Change-Id: Id68273dde9c0ce904bca7b40aa2e9558880c55c2
2010-07-19 15:51:17 -07:00
Adam Powell
3b1f1bce1c Merge "Fix bug 2852909 - screen density for contextual action bar" 2010-07-19 15:48:53 -07:00
Adam Powell
dcdefbbff2 Fix bug 2852909 - screen density for contextual action bar
Change-Id: I9e3d8fe4e6f5eb0282cc103a98ed60ca2911c91e
2010-07-19 15:46:48 -07:00
Madan Ankapura
ae96f634ec typo fixed
Change-Id: Ie7cff39929ae53ce03409afadcae58548ec22cc8
2010-07-19 15:43:00 -07:00
Jason Sams
6e738552ea Merge "Threading RS ForEach." 2010-07-19 15:39:05 -07:00
Jason Sams
8e6c17fcc4 Threading RS ForEach.
Change-Id: I5d6fe4db2b6ac0613394bc5a066ff90ec146d60e
2010-07-19 15:38:19 -07:00
Mason Tang
f9c4bdb739 Merge "Added support for full-text search in Calendar" 2010-07-19 15:32:45 -07:00
Vasu Nori
fddc0858f2 am 3766ed3e: am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit '3766ed3eed6be0a9e78193166bab64bf25f02e81'

* commit '3766ed3eed6be0a9e78193166bab64bf25f02e81':
  fix javadoc error which breaks SDK build in gingerbread
2010-07-19 15:32:10 -07:00
Vasu Nori
3766ed3eed am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
2010-07-19 15:29:10 -07:00
Mason Tang
19f845804c Added support for full-text search in Calendar
Change-Id: I716eba966ad072ac62a61f3cfbfe15b623f8ab94
2010-07-19 15:28:23 -07:00
Vasu Nori
a5fe776a79 Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 2010-07-19 15:26:39 -07:00
Vasu Nori
345f39a8a3 fix javadoc error which breaks SDK build in gingerbread
Change-Id: I01b90c71e7088f385a73f51144063a2fbe5d466b
2010-07-19 15:25:32 -07:00
Mike Lockwood
03559753ce Add support for emulating external storage on devices with no SD card
Change-Id: I4feb03a4b8f4eae33e940477b355d3a4cac7fa86
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-19 18:25:03 -04:00
The Android Open Source Project
e7a6ad80dc am 535f6f67: ignore from open-source master
Merge commit '535f6f67ecfb16bbdc3d9adf8867e3c91be005fc'

* commit '535f6f67ecfb16bbdc3d9adf8867e3c91be005fc':
  Remove the window from being a target for motion events when it is destroyed.
2010-07-19 15:22:40 -07:00
The Android Open Source Project
535f6f67ec ignore from open-source master
Change-Id: Id828527be6c49886f3e40cc2dbe61a5c9c965e71
2010-07-19 15:19:44 -07:00
Maciej Białka
26824b7a9e Remove the window from being a target for motion events when it is destroyed.
If window was destroyed when touch was pressed this destroyed
window was still considered as a target for motion events.
In some cases this could result with hang up inside event dispatch procedure.

Change-Id: I2ede17a40b14b2f509ab3d2560abb65292324f45
2010-07-19 15:12:20 -07:00
Winson Chung
456a00c4ae Merge "Initial changes to allow collections in widgets." 2010-07-19 15:02:33 -07:00
Scott Main
9abf2067f0 am 3dfa6ec5: am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9'

* commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9':
  docs: add troubleshooting to eclipse guide about restarting adb
2010-07-19 14:57:29 -07:00
Scott Main
3dfa6ec5f3 am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '945ac54da56f79c8407c0111d6ded25afcc159fc' into gingerbread-plus-aosp

* commit '945ac54da56f79c8407c0111d6ded25afcc159fc':
  docs: add troubleshooting to eclipse guide about restarting adb
2010-07-19 14:52:35 -07:00
Scott Main
945ac54da5 am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread

* commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d':
  docs: add troubleshooting to eclipse guide about restarting adb
2010-07-19 14:50:32 -07:00
Winson Chung
499cb9f516 Initial changes to allow collections in widgets.
Change-Id: I3cfa899bae88cd252912cecebc12e93c27a3b7c9
2010-07-19 14:48:31 -07:00
Scott Main
85e7ae9bbb Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 2010-07-19 14:42:13 -07:00
Vasu Nori
6b98ece3e5 Merge "fix javadoc error" 2010-07-19 14:13:57 -07:00
Vasu Nori
fb5bccf229 fix javadoc error
Change-Id: I387e2807af2ea6299a976e0763e6ad6f264543fe
2010-07-19 14:11:54 -07:00
Danica Chang
cab94f75aa am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'

* commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
2010-07-19 13:52:38 -07:00
Danica Chang
cbbd3a1b95 am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp

* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
2010-07-19 13:50:49 -07:00
Danica Chang
f23682f128 Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 2010-07-19 13:47:50 -07:00
John Wang
4a1d035b93 Merge "Handle call list in CallManager." 2010-07-19 13:42:37 -07:00
John Wang
7d99cad7e0 Handle call list in CallManager.
Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
     * 1. APIs to access list of calls
     * 2. APIs to check if any active call, which has connection other than
     * disconnected ones, pleaser refer to Call.isIdle()
     * 3. APIs to return first active call
     * 4. APIs to return the connections of first active call
     * 5. APIs to return other property of first active call

Change-Id: I195682dbce630eda80144e169bf84c17177f3368
2010-07-19 13:40:15 -07:00
The Android Open Source Project
87497936f5 am 27dfb307: merge from open-source master
Merge commit '27dfb3070adc90ddfcc398a352de1741f52add03'

* commit '27dfb3070adc90ddfcc398a352de1741f52add03':
  Replaced deprecated calls to setButton and setButton2
2010-07-19 12:54:10 -07:00
The Android Open Source Project
27dfb3070a merge from open-source master
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
2010-07-19 12:49:39 -07:00
The Android Open Source Project
18814b4c8a am 9ab60279: merge from open-source master
Merge commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6'

* commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6':
  Replaced deprecated setButton Methodcalls
2010-07-19 12:48:47 -07:00
James Dong
0c5f2ec25f Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
2010-07-19 12:41:35 -07:00
Fabrice Di Meglio
b9b918d6e1 Merge "Fix bug #2846543 Delete HIDDEN column from the "Calendars" table" 2010-07-19 12:30:01 -07:00
The Android Open Source Project
9ab60279fd merge from open-source master
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
2010-07-19 12:17:53 -07:00
Mike Lockwood
6ef3593c36 Merge "MTP: Only send events to host if we have an open session." 2010-07-19 11:31:54 -07:00
Mike Lockwood
f17896df20 Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns" 2010-07-19 11:31:38 -07:00