summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c5931edb: am c65e4633: Merge "Optional <uses-permission> not yet ↵Nick Kralevich2013-04-115-4/+8
|\ | | | | | | | | | | | | supported." into jb-mr2-dev * commit 'c5931edb4c8d95e90ac739ec88d8fca2610a57f1': Optional <uses-permission> not yet supported.
| * am c65e4633: Merge "Optional <uses-permission> not yet supported." into ↵Nick Kralevich2013-04-115-4/+8
| |\ | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'c65e463356e9c8b646e80d0bfb6cfc76a0a1b426': Optional <uses-permission> not yet supported.
| | * Merge "Optional <uses-permission> not yet supported." into jb-mr2-devNick Kralevich2013-04-115-4/+8
| | |\
| | | * Optional <uses-permission> not yet supported.Nick Kralevich2013-04-115-4/+8
| | | | | | | | | | | | | | | | Change-Id: Ieaa97a29db75161f35905ff340b2c525bbf50612
* | | | am 8a675b9a: am 6e8a2dd3: Merge "Trace: unhide app tracing APIs" into jb-mr2-devJamie Gennis2013-04-112-11/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8a675b9aca36fdccdefd67d20128c9b5bc03644a': Trace: unhide app tracing APIs
| * | | am 6e8a2dd3: Merge "Trace: unhide app tracing APIs" into jb-mr2-devJamie Gennis2013-04-112-11/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '6e8a2dd3e66e65008a70fc09f6532b231d9b5f27': Trace: unhide app tracing APIs
| | * | Merge "Trace: unhide app tracing APIs" into jb-mr2-devJamie Gennis2013-04-112-11/+11
| | |\ \
| | | * | Trace: unhide app tracing APIsJamie Gennis2013-04-102-11/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I48316623fe0394d3fe77e9abca3f6dbf791d0c08
* | | | | am 2f8caf6a: am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" ↵Scott Main2013-04-111-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '2f8caf6a74c5d6bcddbc4fae57945c83e85788bd': add api level 18 to javadoc 'since' tags
| * | | | am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-devScott Main2013-04-111-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'dac80f633977308ec87cca1dea802e81d0fb75ad': add api level 18 to javadoc 'since' tags
| | * | | Merge "add api level 18 to javadoc 'since' tags" into jb-mr2-devScott Main2013-04-111-0/+1
| | |\ \ \
| | | * | | add api level 18 to javadoc 'since' tagsScott Main2013-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea2e13ef2fad47d6a19d380b5655aeeda0414930
* | | | | | am 0b234469: am 873a39cd: am 6ca3484c: am 430e0c77: am f24a3798: am ↵Scott Main2013-04-119-1418/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d17356b0: am f2f5b6ef: delete orphaned/redirected files * commit '0b234469bfc45006c10297fb95206c50260a21da': delete orphaned/redirected files
| * | | | | am 873a39cd: am 6ca3484c: am 430e0c77: am f24a3798: am d17356b0: am ↵Scott Main2013-04-119-1418/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2f5b6ef: delete orphaned/redirected files * commit '873a39cd3cc9f2319819cb94bc80a0e15a6d565b': delete orphaned/redirected files
| | * | | | am 6ca3484c: am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete ↵Scott Main2013-04-119-1418/+0
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | orphaned/redirected files * commit '6ca3484c3fb8ffd78bc67e2ded7687b11ec76b5e': delete orphaned/redirected files
| | | * | | am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete ↵Scott Main2013-04-119-1418/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orphaned/redirected files * commit '430e0c77aae517bfe45700a81251864723719827': delete orphaned/redirected files
| | | | * \ \ am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected filesScott Main2013-04-119-1418/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f24a3798781719e99ce45373942f4199e748d59d': delete orphaned/redirected files
| | | | | * \ \ am d17356b0: am f2f5b6ef: delete orphaned/redirected filesScott Main2013-04-119-1418/+0
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd17356b0e23cf79eb1e0dd2f2fadbe4a7f56e886': delete orphaned/redirected files
| | | | | | * \ \ am f2f5b6ef: delete orphaned/redirected filesScott Main2013-04-119-1418/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2f5b6ef987e30919907cf5417fb2b7cac9e2256': delete orphaned/redirected files
| | | | | | | * | | delete orphaned/redirected filesScott Main2013-04-109-1418/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6539076edf8962fd974d790a0edd1d4badc4d5f7
* | | | | | | | | | Merge "Fix shortcut keys to operate as current user"Michael Wright2013-04-111-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix shortcut keys to operate as current userMichael Wright2013-04-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I967b52604b7faee0d5f341dbbe51b2a4734f4d91
* | | | | | | | | | | am ea4f556f: am 651f99cb: Merge "Sensor values changes." into jb-mr2-devJaikumar Ganesh2013-04-115-83/+160
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea4f556f707678aa4d4be3f60b1dc34380f9f15a': Sensor values changes.
| * | | | | | | | | | am 651f99cb: Merge "Sensor values changes." into jb-mr2-devJaikumar Ganesh2013-04-115-83/+160
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '651f99cb5588ccd313e2e532a6b9ccf9d679ff44': Sensor values changes.
| | * | | | | | | | | Merge "Sensor values changes." into jb-mr2-devJaikumar Ganesh2013-04-115-83/+160
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Sensor values changes.Jaikumar Ganesh2013-04-115-83/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove Sensor Event Pool. 2. Allocate fixed array values for each Sensor added. - Needed for backward compatibility. 3. Use SDK checks for backward compatibility for rotation vector. b/8165631 Change-Id: I2d2cf10d3460478ed7af8e6188343f4bb033503c
* | | | | | | | | | | | am efda6203: am 28327210: Merge "Add new sensor types." into jb-mr2-devJaikumar Ganesh2013-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efda6203cd3e2ff06e531cff51db13db200702c4': Add new sensor types.
| * | | | | | | | | | | am 28327210: Merge "Add new sensor types." into jb-mr2-devJaikumar Ganesh2013-04-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '283272103bb6e0913c51c6b5c1de0f39608dd234': Add new sensor types.
| | * | | | | | | | | | Merge "Add new sensor types." into jb-mr2-devJaikumar Ganesh2013-04-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Add new sensor types.Jaikumar Ganesh2013-04-058-224/+555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add uncalibrated gyros and magnetic field sensor. 2. Change max number of events from 3 to 16. 3. Add new APIs for trigger sensors.
* | | | | | | | | | | | am 380043de: am 9a8df4dc: Add new sensor types.Jaikumar Ganesh2013-04-118-224/+555
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '380043deb0607262505baa2d3c8a46a8277697e5': Add new sensor types.
| * | | | | | | | | | | am 9a8df4dc: Add new sensor types.Jaikumar Ganesh2013-04-118-224/+555
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a8df4dcf9f83c1cf0cd8dedeb51d1ff8a52a2b5': Add new sensor types.
| | * | | | | | | | | | Add new sensor types.Jaikumar Ganesh2013-04-118-224/+555
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add uncalibrated gyros and magnetic field sensor. 2. Change max number of events from 3 to 16. 3. Add new APIs for trigger sensors. Change-Id: Ifac5c0024c8e5f88b721e5cd97ff26afaaa36717
* | | | | | | | | | | am 8111f049: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8111f049a111ac754ede9d1f0750fb08ac895119': Permit null adapters in Spinners Don't draw synchronously in onResume()
| * | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb42e43150519a7abeb6f70ec4ae34f5f8a35220
| | * \ \ \ \ \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Permit null adapters in SpinnersAdam Powell2013-04-101-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 8538144 Change-Id: I83f0ae78ce15f46827fb721cd0df1972b7d9d198
| | | * | | | | | | | | Don't draw synchronously in onResume()Mathias Agopian2013-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this could cause a dead-lock if the applicaltion's draw implementation blocks until something happenson the main ui thread. note: we're still doing this synchronous draw in onWindowResize() because that's what the previous implementation did. Technically, it has the same problem. Bug: 8586305 Change-Id: I782568289cc9419346aeea73775d86faa28b3058
* | | | | | | | | | | | am 09e49980: am f8a67f4f: Merge "Make BluetoothGattServer.close() public" ↵Matthew Xie2013-04-102-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '09e49980df612785152f742edc96c1d3116dbe56': Make BluetoothGattServer.close() public
| * | | | | | | | | | | am f8a67f4f: Merge "Make BluetoothGattServer.close() public" into jb-mr2-devMatthew Xie2013-04-102-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8a67f4f5dd4c5499a6e7148331f0286e31203ec': Make BluetoothGattServer.close() public
| | * | | | | | | | | | Merge "Make BluetoothGattServer.close() public" into jb-mr2-devMatthew Xie2013-04-112-2/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Make BluetoothGattServer.close() publicAndre Eisenbach2013-04-102-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functino is needed for applications to un-register from the Bluetooth stack. bug 8591003 Change-Id: Id05f592245d1d90791d34c3617aadac67bc6502c
* | | | | | | | | | | | | am 4e8a3bcf: am 3eba934a: Merge "Clean up USAGE_SHARED and add syncing for ↵Tim Murray2013-04-101-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USAGE_SHARED." into jb-mr2-dev * commit '4e8a3bcf03cdaeba6ea2f7cbbbb55c7b10c19e9c': Clean up USAGE_SHARED and add syncing for USAGE_SHARED.
| * | | | | | | | | | | | am 3eba934a: Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." ↵Tim Murray2013-04-101-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '3eba934a2747f71fa0aba2e1949567c786265359': Clean up USAGE_SHARED and add syncing for USAGE_SHARED.
| | * | | | | | | | | | | Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-devTim Murray2013-04-111-4/+13
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Clean up USAGE_SHARED and add syncing for USAGE_SHARED.Tim Murray2013-04-091-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 8567006 Change-Id: Ie9c01eeccdd3fa0a81893314dfbce7c012d3f7d3
* | | | | | | | | | | | | | am 9908c674: am ef0066a8: am bc80d99b: am 55aa87b2: am bd6b22d8: am ↵Scott Main2013-04-1025-28/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes * commit '9908c6744ecf19a50f726b4fec4ac63e213a840d': add meta tags to the rest of the training classes
| * | | | | | | | | | | | | am ef0066a8: am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am ↵Scott Main2013-04-1025-28/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c2dea05: add meta tags to the rest of the training classes * commit 'ef0066a8c35b29dcf308b8e51a664ce044e79f61': add meta tags to the rest of the training classes
| | * | | | | | | | | | | | am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta ↵Scott Main2013-04-1025-28/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags to the rest of the training classes * commit 'bc80d99bd9bbf747b42137a24d63a17f71e276d2': add meta tags to the rest of the training classes
| | | * | | | | | | | | | | am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the ↵Scott Main2013-04-1025-28/+35
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rest of the training classes * commit '55aa87b2b36359441c3acb4222980fda8ba2c980': add meta tags to the rest of the training classes
generated by cgit v1.1 at 2025-02-12 02:24:39 +0000