summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge "checkpoint tablet status bar"Joe Onorato2010-07-1516-1569/+1948
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | checkpoint tablet status barJoe Onorato2010-07-1216-1569/+1948
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9089cce370ead4e685dffbca722fa8404a8f443
* | | | | | | | | | | | | | | Add various properties to View to allow it to be moved, scaled, faded, and ↵Chet Haase2010-07-153-38/+974
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotated by property manipulation instead of just Animation operations. Change-Id: Iefab11f243c7511f7bba0e32bd399ed716b9131f
* | | | | | | | | | | | | | | Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic."Mike Lockwood2010-07-153-55/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove our copy of the f_mtp.h kernel header, now that it is in bionic.Mike Lockwood2010-07-153-55/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b5e72bf25b3525ace4b919c6e8b6bd6750f6dfa Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | | | | am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target.Jeff Brown2010-07-152-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd1313da5999e06be16e52527cfba443f66b333a1' * commit 'd1313da5999e06be16e52527cfba443f66b333a1': Don't build framework tests for simulator target.
| * | | | | | | | | | | | | | | am eb6e0df1: Don\'t build framework tests for simulator target.Jeff Brown2010-07-152-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp * commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3': Don't build framework tests for simulator target.
| | * | | | | | | | | | | | | | Don't build framework tests for simulator target.Jeff Brown2010-07-142-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70f29c7eb307e4f3ec5702f4eb9d97b4342e2f36
* | | | | | | | | | | | | | | | Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect ↵Fabrice Di Meglio2010-07-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | what's visible on the web.)"
| * | | | | | | | | | | | | | | | Fix bug #2793828 (Sync/visible setting on the phone should not affect what's ↵Fabrice Di Meglio2010-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | visible on the web.) - introduce "sync4" column into Calendars table to store "selected" from Web calendar Change-Id: I2dfebb6e4a2ec85e758626a4e2b9c8b1315f095f
* | | | | | | | | | | | | | | | | Merge "SQLiteDatabase: Add mechanism for registering custom sqlite3 functions"Mike Lockwood2010-07-152-6/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | SQLiteDatabase: Add mechanism for registering custom sqlite3 functionsMike Lockwood2010-07-142-6/+132
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to define a callback in Java that can be called from sqlite3 database triggers. Change-Id: I09fdbd38c9807b6b0dd19c2761b01e8db76f1adc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | | | | am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification ↵Andrew Stadler2010-07-141-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using insecure factory" into froyo Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114' * commit '521e9aa7523220c3dc48f6abd32fad6b76eea114': Skip hostname verification when using insecure factory
| * | | | | | | | | | | | | | | am c98e4311: am 468c82e4: Merge "Skip hostname verification when using ↵Andrew Stadler2010-07-141-6/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insecure factory" into froyo Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp * commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9': Skip hostname verification when using insecure factory
| | * | | | | | | | | | | | | | am 468c82e4: Merge "Skip hostname verification when using insecure factory" ↵Andrew Stadler2010-07-141-6/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread * commit '468c82e4be0630de04a50d88602cd8c6bc745962': Skip hostname verification when using insecure factory
| | | * | | | | | | | | | | | | Merge "Skip hostname verification when using insecure factory" into froyoAndrew Stadler2010-07-141-6/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Skip hostname verification when using insecure factoryAndrew Stadler2010-07-121-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the factory was obtained by calling getInsecure(), calls to createSocket() should skip hostname verification (along with all of the other skipped safety checks.) This change slightly relaxes the too-strict checking that was introduced in change 7fc93c36ae235115727296780dbc35101622bbd4. Bug: 2834174 Change-Id: Iab7ef861ad0ca727f82ee8cdb78b89b9e835740d
* | | | | | | | | | | | | | | | | am c74034b6: am 24651682: added BinderService<> template to help creating ↵Mathias Agopian2010-07-148-46/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native binder services Merge commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c' * commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c': added BinderService<> template to help creating native binder services
| * | | | | | | | | | | | | | | | am 24651682: added BinderService<> template to help creating native binder ↵Mathias Agopian2010-07-148-46/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | services Merge commit '24651682edaf71e8a826f23a7ea09bc97c8072c4' into gingerbread-plus-aosp * commit '24651682edaf71e8a826f23a7ea09bc97c8072c4': added BinderService<> template to help creating native binder services
| | * | | | | | | | | | | | | | | added BinderService<> template to help creating native binder servicesMathias Agopian2010-07-148-46/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id980899d2647b56479f8a27c89eaa949f9209dfe
* | | | | | | | | | | | | | | | | am 78983a91: am 4055b780: Merge "move native services under services/" into ↵Mathias Agopian2010-07-1473-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f' * commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f': move native services under services/
| * | | | | | | | | | | | | | | | am 4055b780: Merge "move native services under services/" into gingerbreadMathias Agopian2010-07-1473-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp * commit '4055b780bb7e85abcf4754b84e50bf407c45bec8': move native services under services/
| | * | | | | | | | | | | | | | | Merge "move native services under services/" into gingerbreadMathias Agopian2010-07-1473-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | move native services under services/Mathias Agopian2010-07-1473-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved surfaceflinger, audioflinger, cameraservice all native services should now reside in this location. Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
* | | | | | | | | | | | | | | | | Merge "add a paramter to control page-load-termination-on-JS-error"Guang Zhu2010-07-142-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | add a paramter to control page-load-termination-on-JS-errorGuang Zhu2010-07-142-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous change terminates page load if there's certain JS errors; the intention was to speed up layout tests such that page accessing non-existent test controllers/methods will get immediate termination instead of waiting on timeout. However this causes problem for page cycler because it may interrupt the test run too early. Also there was a bug on bracketing on the termination conditions (operator precendence issue). Change-Id: I2f19e48fa0061286fddf0f7cbb4953d7f7d88f76
* | | | | | | | | | | | | | | | | | am 0a48a1f3: am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." ↵Dianne Hackborn2010-07-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '0a48a1f31dcfb152c166ff5621942c950f8cca72' * commit '0a48a1f31dcfb152c166ff5621942c950f8cca72': Argh oops I didn't mean to delete this.
| * | | | | | | | | | | | | | | | | am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbreadDianne Hackborn2010-07-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp * commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0': Argh oops I didn't mean to delete this.
| | * | | | | | | | | | | | | | | | Merge "Argh oops I didn't mean to delete this." into gingerbreadDianne Hackborn2010-07-141-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Argh oops I didn't mean to delete this.Dianne Hackborn2010-07-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d0877d56f1abab3d0929a086621f4ef1212cecc
* | | | | | | | | | | | | | | | | | | resolved conflicts for merge of e03952c0 to masterJim Miller2010-07-145-22/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0
| * | | | | | | | | | | | | | | | | am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in ↵Jim Miller2010-07-145-22/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework" into gingerbread Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp * commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2': Fix 2797185: Re-enable thumbnail generation in framework
| | * | | | | | | | | | | | | | | | Merge "Fix 2797185: Re-enable thumbnail generation in framework" into ↵Jim Miller2010-07-145-22/+94
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | | | | | | | | | Fix 2797185: Re-enable thumbnail generation in frameworkJim Miller2010-07-135-22/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This re-enables thumbnail generation code in the framework with a few improvements. In addition to enabling the system to capture thumbnails, it removes padding from the borders to account for space overlapped by system widgets (status bar, etc.). Thus, the contents of the bitmap are only those pixels unique to the activity. It also maximizes resolution of the bitmap by capturing the image in the application's current orientation. In landscape mode, it captures a bitmap with dimensions w x h. In portrait, it captures a bitmap with dimensions h x w. Where w and h are thumbnail_width and thumbnail_height as defined in dimens.xml. Though enabled, the change is not currently used in this branch. The work is being checked in here to avoid complicated downstream merges. Change-Id: Ifc8a4e0075d7d0697d8159589be3816ace31d70c
* | | | | | | | | | | | | | | | | | Argh oops I didn't mean to delete this.Dianne Hackborn2010-07-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8910eb8b6e898b77ee6fc63420d6954b496513ca
* | | | | | | | | | | | | | | | | | am 7417ae93: am ccc77328: Merge "Remove old glue code." into gingerbreadDianne Hackborn2010-07-143-553/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1' * commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1': Remove old glue code.
| * | | | | | | | | | | | | | | | | am ccc77328: Merge "Remove old glue code." into gingerbreadDianne Hackborn2010-07-143-553/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ccc77328da66436010f3bca000c4b4665270500a' into gingerbread-plus-aosp * commit 'ccc77328da66436010f3bca000c4b4665270500a': Remove old glue code.
| | * | | | | | | | | | | | | | | | Merge "Remove old glue code." into gingerbreadDianne Hackborn2010-07-143-553/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Remove old glue code.Dianne Hackborn2010-07-143-553/+0
| | | | |_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic4a9c1f09d9bd4258d9766d546b0999b79997635
* | | | | | | | | | | | | | | | | am db386f2c: am c9a11088: Merge "first step at implementing the native ↵Mathias Agopian2010-07-1415-1/+1198
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensor support" into gingerbread Merge commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916' * commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916': first step at implementing the native sensor support
| * | | | | | | | | | | | | | | | am c9a11088: Merge "first step at implementing the native sensor support" ↵Mathias Agopian2010-07-1415-1/+1198
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06' into gingerbread-plus-aosp * commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06': first step at implementing the native sensor support
| | * | | | | | | | | | | | | | | Merge "first step at implementing the native sensor support" into gingerbreadMathias Agopian2010-07-1415-1/+1198
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | first step at implementing the native sensor supportMathias Agopian2010-07-1315-1/+1198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in this commit: - implemented the C stub - implemented the binder interfaces involved - implemented most of the C++ client side missing: - SensorManager cannot connect to the SensorServer yet (because there is no SensorServer yet) Change-Id: I75010cbeef31c98d6fa62fd5d388dcef87c2636b
* | | | | | | | | | | | | | | | | | am 98704f14: am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s ↵Mathias Agopian2010-07-144-52/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sake." into gingerbread Merge commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87' * commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87': Remove the YV16 format for simplicity's sake.
| * | | | | | | | | | | | | | | | | am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into ↵Mathias Agopian2010-07-144-52/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp * commit '38eea8bf990540360b45b963195a7766c30b55d2': Remove the YV16 format for simplicity's sake.
| | * | | | | | | | | | | | | | | | Merge "Remove the YV16 format for simplicity's sake." into gingerbreadMathias Agopian2010-07-144-52/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Remove the YV16 format for simplicity's sake.Mathias Agopian2010-07-144-52/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee03d100933ba0c67b13d51e0435be3b4cd953cf
* | | | | | | | | | | | | | | | | | | Merge "Bug 2841148 - Add accessors for action bar context mode state."Adam Powell2010-07-144-0/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bug 2841148 - Add accessors for action bar context mode state.Adam Powell2010-07-144-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I04f3efce5a692b346756cc80c8d15f3abba10558
* | | | | | | | | | | | | | | | | | | Merge "Do not apply transforms when using drawColor()."Romain Guy2010-07-147-148/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \