drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,349 Commits 1 Branch 0 Tags
Commit Graph

119349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
97de064a9a am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases" 
* commit '133f6826e58aa7643858d4e50630103eb01f1815':
  Runtime resource overlay, iteration 2, test cases
 2014-02-12 19:22:24 +00:00
Nick Kralevich
dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp 
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
 2014-02-12 11:05:59 -08:00
Scott Main
aa318b2851 am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about 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
 2014-02-12 17:09:06 +00:00
Dirk Dougherty
17f0d48ccf am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit '8b6597bd07411ff3037d068dd0ef55d70ff18f18':
  Update generated docs for Google Play Services.
 2014-02-12 17:09:03 +00:00
Scott Main
879592d89a am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient 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
 2014-02-12 17:06:32 +00:00
Dirk Dougherty
8b6597bd07 am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit 'b6ecc342d3e9f355a78a0a10e613bbda31286f3a':
  Update generated docs for Google Play Services.
 2014-02-12 17:06:26 +00:00
Scott Main
bc64716cfb am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about 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
 2014-02-12 17:03:26 +00:00
Dirk Dougherty
b6ecc342d3 am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit '37ae70326feebd23cf2b9c5254f1250d5bf3a029':
  Update generated docs for Google Play Services.
 2014-02-12 17:03:22 +00:00
Scott Main
a2739fa795 am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil 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
 2014-02-12 16:59:56 +00:00
Scott Main
a4c5bba07e add document about GoogleApiClient and one about GoogleAuthUtil 
also remove the Authorization document from the Google Services
section.
bug:10679818

Change-Id: Ibfade1eca68d89afe30b79d75ca5e38a2b3a84a8
 2014-02-12 08:54:49 -08:00
Dirk Dougherty
37ae70326f am 1654264e: Update generated docs for Google Play Services. 
* commit '1654264edd68adfd4347d12112aa3124f1d0acb9':
  Update generated docs for Google Play Services.
 2014-02-12 03:13:19 +00:00
Dirk Dougherty
1654264edd Update generated docs for Google Play Services. 
Change-Id: I6dab64736cd07b1ffb398d9baab21250552c5e17
 2014-02-11 18:19:13 -08:00
Scott Main
dac4429f21 am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add 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 '08d28f59bd74ab4109cf5343ef056a8d4b796ef6':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:24:02 +00:00
Scott Main
08d28f59bd am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add 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 '6d1d21340fe6ca84fdef76dd6f9ba7c315b7a73e':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:18:48 +00:00
Scott Main
6d1d21340f am 11bb34da: am 9854f69f: Merge "add 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 '11bb34da5f68f70f3350199e3578445d9a1eaae3':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:15:25 +00:00
Scott Main
11bb34da5f am 9854f69f: Merge "add 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 '9854f69f75352e473e34410b0b298b7c7f04434a':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:12:08 +00:00
Scott Main
9854f69f75 Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page" into klp-docs 2014-02-12 01:09:21 +00:00
Jeff Brown
be83e4a08e am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit '38f96e5020b3e82b98fe97b0be363a5ad185860f':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-12 00:37:24 +00:00
Jeff Brown
38f96e5020 Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
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
 2014-02-11 14:43:04 -08:00
Griff Hazen
4e795ebe17 am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 
* commit '0ff811db58089e7b4e8fbca4f41be8f20c86ce10':
  Add local-only option to Notification (using flag)
 2014-02-11 21:34:53 +00:00
Dianne Hackborn
133f6826e5 am 89492190: Merge "Runtime resource overlay, iteration 2, test cases" 
* commit '89492190b39e301d8203d0a9a9f6b11120c16ecb':
  Runtime resource overlay, iteration 2, test cases
 2014-02-11 13:34:49 -08:00
Dianne Hackborn
4ad93639d2 am 67754d93: Merge "Runtime resource overlay, iteration 2" 
* commit '67754d93c4bfb2da1831b1dd2b40c12a838b1028':
  Runtime resource overlay, iteration 2
 2014-02-11 13:34:46 -08:00
Dianne Hackborn
89492190b3 Merge "Runtime resource overlay, iteration 2, test cases" 2014-02-11 21:30:08 +00:00
Dianne Hackborn
67754d93c4 Merge "Runtime resource overlay, iteration 2" 2014-02-11 21:29:58 +00:00
Griff Hazen
0ff811db58 Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 2014-02-11 21:26:53 +00:00
Dianne Hackborn
be49403a03 am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'" 
* commit '0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21':
  New command line tool 'idmap'
 2014-02-11 20:35:50 +00:00
Dianne Hackborn
0cd115e1ce am 578087e3: Merge "New command line tool \'idmap\'" 
* commit '578087e39845a0c9a728ba18963f498d1f69b279':
  New command line tool 'idmap'
 2014-02-11 12:32:17 -08:00
Dianne Hackborn
578087e398 Merge "New command line tool 'idmap'" 2014-02-11 20:30:08 +00:00
Katie McCormick
b8645efbc8 am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit 'caec59c176444c87fe6fdd58edc1bbc61242eebb':
  Doc update: clarify best practices.
 2014-02-11 20:27:33 +00:00
Katie McCormick
caec59c176 am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit 'd2e6c89a24b9049c490c551ac49ecc75570fc50e':
  Doc update: clarify best practices.
 2014-02-11 20:23:58 +00:00
Katie McCormick
d2e6c89a24 am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit '0a96a82bbe153ed2337b67435016d35eb434da16':
  Doc update: clarify best practices.
 2014-02-11 20:22:00 +00:00
Katie McCormick
0a96a82bbe am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit '0cb2c76b66bb7c413221fc0c5ea07b7779c97dea':
  Doc update: clarify best practices.
 2014-02-11 20:16:26 +00:00
Katie McCormick
0cb2c76b66 Merge "Doc update: clarify best practices." into klp-docs 2014-02-11 20:13:34 +00:00
Griff Hazen
dfcb0803bf Add local-only option to Notification (using flag) 
Change-Id: Ic6d2f3b0cf06b58c0afa2af0fa6b245124424223
 2014-02-11 12:00:00 -08:00
Narayan Kamath
86fb9904ad am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 16:34:16 +00:00
Narayan Kamath
43c9516a29 am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
  Fix in MediaMuxer's JNI code
 2014-02-11 16:34:12 +00:00
Narayan Kamath
a9d171bd5b am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit '5c770dfba2846ee173d147fd974f8e9f073c1534':
  Use long to store pointers in ConsumerIrService
 2014-02-11 16:34:08 +00:00
Narayan Kamath
d350af9695 am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 16:34:04 +00:00
Narayan Kamath
8a63c34bb0 am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '3aeb629d8251699237e3d067be4fb44ba206626c':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 08:30:28 -08:00
Narayan Kamath
860bba68a1 am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '7b7726b7982063034667c6a6076cc0b390ede8ce':
  Fix in MediaMuxer's JNI code
 2014-02-11 08:30:25 -08:00
Narayan Kamath
5c770dfba2 am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit 'b823bd45600fc339ae2e618d5fe506ace74ada4a':
  Use long to store pointers in ConsumerIrService
 2014-02-11 08:30:20 -08:00
Narayan Kamath
b90fc64b03 am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'f44a3f1e00e38b09f70efed3eaf771871435e478':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 08:30:06 -08:00
Narayan Kamath
3aeb629d82 Merge "Use long to store pointers in GLES_JNI/EGL classes" 2014-02-11 15:39:04 +00:00
Narayan Kamath
7b7726b798 Merge "Fix in MediaMuxer's JNI code" 2014-02-11 14:33:38 +00:00
Narayan Kamath
b823bd4560 Merge "Use long to store pointers in ConsumerIrService" 2014-02-11 14:29:09 +00:00
Narayan Kamath
f44a3f1e00 Merge "Use long for pointers in EmojiFactory and PdfDocument" 2014-02-11 14:07:17 +00:00
Narayan Kamath
deefd1fdea am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 
* commit '5f7c0b1d80f883fa15f88e0e4d508576a36a45de':
  Fix TinyHashMap to use generic hash_type instead of hash_t
 2014-02-11 13:47:50 +00:00
Narayan Kamath
5f7c0b1d80 am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 
* commit '6d8b21a84c92904a966d77f3c6c0282e92c2b077':
  Fix TinyHashMap to use generic hash_type instead of hash_t
 2014-02-11 05:44:37 -08:00
Narayan Kamath
6d8b21a84c Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 2014-02-11 13:40:38 +00:00
Jeff Brown
25df673b84 am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev 
* commit '1b51c9cb96fe2a0818289857a016521eed1ec183':
  Make SystemService constructor take a Context.
 2014-02-11 08:18:34 +00:00