summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add ↵Scott Main2014-02-127-73/+1107
|\ | | | | | | | | | | | | document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit 'aa318b2851042c6f98723446f33469a6545c7294': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| * am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about ↵Scott Main2014-02-127-73/+1107
| |\ | | | | | | | | | | | | | | | | | | GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit '879592d89a78383a9e3cd29d53357f34337e5f04': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | * am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient ↵Scott Main2014-02-127-73/+1107
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit 'bc64716cfb1269d07b64f89c3b46800afa5dc266': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | | * am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about ↵Scott Main2014-02-127-73/+1107
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit 'a2739fa795981f597b044e93a5c552051cfe1c00': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | | | * am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil ↵Scott Main2014-02-127-73/+1107
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also remove the Authorization document from the Google Services section. bug:10679818 * commit 'a4c5bba07e121569ab504b2191ee576f09407f5b': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | | | | * add document about GoogleApiClient and one about GoogleAuthUtilScott Main2014-02-127-73/+1107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also remove the Authorization document from the Google Services section. bug:10679818 Change-Id: Ibfade1eca68d89afe30b79d75ca5e38a2b3a84a8
* | | | | | am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update ↵Dirk Dougherty2014-02-12398-31181/+137525
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generated docs for Google Play Services. * commit '17f0d48ccf4ea817308e8cc3958d249bf77c2a2f': Update generated docs for Google Play Services.
| * | | | | am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs ↵Dirk Dougherty2014-02-12398-31181/+137525
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Google Play Services. * commit '8b6597bd07411ff3037d068dd0ef55d70ff18f18': Update generated docs for Google Play Services.
| | * | | | am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play ↵Dirk Dougherty2014-02-12398-31181/+137525
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Services. * commit 'b6ecc342d3e9f355a78a0a10e613bbda31286f3a': Update generated docs for Google Play Services.
| | | * | | am 37ae7032: am 1654264e: Update generated docs for Google Play Services.Dirk Dougherty2014-02-12398-31181/+137525
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit '37ae70326feebd23cf2b9c5254f1250d5bf3a029': Update generated docs for Google Play Services.
| | | | * | am 1654264e: Update generated docs for Google Play Services.Dirk Dougherty2014-02-12398-31181/+137525
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | * commit '1654264edd68adfd4347d12112aa3124f1d0acb9': Update generated docs for Google Play Services.
| | | | | * Update generated docs for Google Play Services.Dirk Dougherty2014-02-11398-31181/+137525
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6dab64736cd07b1ffb398d9baab21250552c5e17
* | | | | | am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add ↵Scott Main2014-02-127-16/+107
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit 'dac4429f21caffea61b626797afd142db5025e42': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| * | | | | am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast ↵Scott Main2014-02-127-16/+107
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '08d28f59bd74ab4109cf5343ef056a8d4b796ef6': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | * | | | am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page ↵Scott Main2014-02-127-16/+107
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '6d1d21340fe6ca84fdef76dd6f9ba7c315b7a73e': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | | * | | am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other ↵Scott Main2014-02-127-16/+107
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '11bb34da5f68f70f3350199e3578445d9a1eaae3': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | | | * | am 9854f69f: Merge "add google cast feature page edit other feature pages ↵Scott Main2014-02-127-16/+107
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '9854f69f75352e473e34410b0b298b7c7f04434a': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | | | | * Merge "add google cast feature page edit other feature pages for consistent ↵Scott Main2014-02-127-16/+107
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | call to action paragraph and remove 'preview' notice from Drive page" into klp-docs
| | | | | | * add google cast feature pageScott Main2014-02-047-16/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page Change-Id: I75f1f24fbae51852246ae0624b355aa23b14e60a
* | | | | | | am be83e4a0: am 38f96e50: Add support for injecting events into ↵Jeff Brown2014-02-129-101/+221
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActivityContainers. (DO NOT MERGE) * commit 'be83e4a08e909b773ffc06a6e59446deadb8af8b': Add support for injecting events into ActivityContainers. (DO NOT MERGE)
| * | | | | | am 38f96e50: Add support for injecting events into ActivityContainers. (DO ↵Jeff Brown2014-02-129-101/+221
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE) * commit '38f96e5020b3e82b98fe97b0be363a5ad185860f': Add support for injecting events into ActivityContainers. (DO NOT MERGE)
| | * | | | | Add support for injecting events into ActivityContainers. (DO NOT MERGE)Jeff Brown2014-02-119-101/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified ActivityView to inject touch events it receives back into its activity container. The container then injects the event into the input system along with the display id of the underlying virtual display. Enhanced the input system to support concurrent dispatch of touch events on multiple displays which is required for this to work. Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
* | | | | | | Fix build.Dianne Hackborn2014-02-113-5/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least part of what is broken. Other stuff still seems to be. Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591 (cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)
* | | | | | am 0ff811db: Merge "Add local-only option to Notification (using flag)" into ↵Griff Hazen2014-02-112-2/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '0ff811db58089e7b4e8fbca4f41be8f20c86ce10': Add local-only option to Notification (using flag)
| * | | | | Merge "Add local-only option to Notification (using flag)" into klp-modular-devGriff Hazen2014-02-112-2/+21
| |\ \ \ \ \
| | * | | | | Add local-only option to Notification (using flag)Griff Hazen2014-02-112-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6d2f3b0cf06b58c0afa2af0fa6b245124424223
* | | | | | | am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"Dianne Hackborn2014-02-114-3/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21': New command line tool 'idmap'
| * \ \ \ \ \ \ am 578087e3: Merge "New command line tool \'idmap\'"Dianne Hackborn2014-02-114-3/+57
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '578087e39845a0c9a728ba18963f498d1f69b279': New command line tool 'idmap'
| | * \ \ \ \ \ \ Merge "New command line tool 'idmap'"Dianne Hackborn2014-02-114-3/+57
| | |\ \ \ \ \ \ \
| | | * | | | | | | New command line tool 'idmap'Mårten Kongstad2014-02-034-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new tool 'idmap' to handle generation and verification of idmap files. The tool is modelled on 'dexopt', and is intended to be used similarly, notably by 'installd'. See cmds/idmap/idmap.cpp for further documentation on 'idmap'. Note: this commit is interdependent on a commit in project build/ to add 'idmap' to PRODUCT_PACKAGES. Note: the changes to androidfw are only stubs. The actual implementation will be provided in Runtime resource overlay, iteration 2. Change-Id: I7131b74ece1e46c8a9c0a31d103e686aa07da2bb
* | | | | | | | | | am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: ↵Katie McCormick2014-02-111-24/+89
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify best practices." into klp-docs * commit 'caec59c176444c87fe6fdd58edc1bbc61242eebb': Doc update: clarify best practices.
| * | | | | | | | | am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best ↵Katie McCormick2014-02-111-24/+89
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | practices." into klp-docs * commit 'd2e6c89a24b9049c490c551ac49ecc75570fc50e': Doc update: clarify best practices.
| | * | | | | | | am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into ↵Katie McCormick2014-02-111-24/+89
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-docs * commit '0a96a82bbe153ed2337b67435016d35eb434da16': Doc update: clarify best practices.
| | | * | | | | | am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docsKatie McCormick2014-02-111-24/+89
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit '0cb2c76b66bb7c413221fc0c5ea07b7779c97dea': Doc update: clarify best practices.
| | | | * | | | | Merge "Doc update: clarify best practices." into klp-docsKatie McCormick2014-02-111-24/+89
| | | | |\ \ \ \ \
| | | | | * | | | | Doc update: clarify best practices.Katie McCormick2014-02-101-24/+89
| | | | | | |_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for: b/12515292 Change-Id: I1616d41c052582ff6c82b87cd0282cf1d25bb84d
* | | | | | | | | am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL ↵Narayan Kamath2014-02-116-90/+113
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | classes" * commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb': Use long to store pointers in GLES_JNI/EGL classes
| * | | | | | | | am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"Narayan Kamath2014-02-116-90/+113
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '3aeb629d8251699237e3d067be4fb44ba206626c': Use long to store pointers in GLES_JNI/EGL classes
| | * | | | | | | Merge "Use long to store pointers in GLES_JNI/EGL classes"Narayan Kamath2014-02-116-90/+113
| | |\ \ \ \ \ \ \
| | | * | | | | | | Use long to store pointers in GLES_JNI/EGL classesAshok Bhat2014-01-316-90/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43b32f2a85c07b3f59c57e28e3d03e8d1cabcd8b Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc': Fix in MediaMuxer's JNI code
| * | | | | | | | | am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b7726b7982063034667c6a6076cc0b390ede8ce': Fix in MediaMuxer's JNI code
| | * | | | | | | | Merge "Fix in MediaMuxer's JNI code"Narayan Kamath2014-02-111-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android_media_MediaMuxer_native_setup should return jlong. It was incorrectly returning jint. Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | | | am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ↵Narayan Kamath2014-02-112-19/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConsumerIrService" * commit '5c770dfba2846ee173d147fd974f8e9f073c1534': Use long to store pointers in ConsumerIrService
| * | | | | | | | | | am b823bd45: Merge "Use long to store pointers in ConsumerIrService"Narayan Kamath2014-02-112-19/+19
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b823bd45600fc339ae2e618d5fe506ace74ada4a': Use long to store pointers in ConsumerIrService
| | * | | | | | | | | Merge "Use long to store pointers in ConsumerIrService"Narayan Kamath2014-02-112-19/+19
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Use long to store pointers in ConsumerIrServiceAshok Bhat2014-02-072-19/+19
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e6562b7dc09f87ad80b1e862b614a370d37feb5 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | | | am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and ↵Narayan Kamath2014-02-114-53/+53
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PdfDocument" * commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659': Use long for pointers in EmojiFactory and PdfDocument
| * | | | | | | | | | am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"Narayan Kamath2014-02-114-53/+53
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f44a3f1e00e38b09f70efed3eaf771871435e478': Use long for pointers in EmojiFactory and PdfDocument