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

123430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ken Wakasa
55f79f509f Fix typo in comments for supportsSwitchingToNextInputMethod 
Change-Id: I387acd8ce3125c0d35e43757de7166a284da630b
 2014-02-12 12:54:58 +09:00
Scott Main
4b1c556965 am 7ef544f0: am dac4429f: 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 '7ef544f07f3bb78d3a49c5cd60ad667964cedd57':
  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:30:04 +00:00
Scott Main
7ef544f07f am dac4429f: 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 'dac4429f21caffea61b626797afd142db5025e42':
  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:26:35 +00: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
1717eb1dc1 am a872c22a: (-s ours) am be83e4a0: am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit 'a872c22aa4b252c55a4fccfb0f2ec501278179ad':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-12 00:45:00 +00:00
Jeff Brown
a872c22aa4 am be83e4a0: am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit 'be83e4a08e909b773ffc06a6e59446deadb8af8b':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-12 00:41:49 +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
47b32a0be1 Merge "Add support for injecting events into ActivityContainers." 2014-02-12 00:35:08 +00:00
Dianne Hackborn
340312efac am d9e385b1: Fix build. 
* commit 'd9e385b111ebf811beb0f29178a2fbd4d667509f':
  Fix build.
 2014-02-11 22:58:16 +00:00
Jeff Brown
ca9bc702df Add support for injecting events into ActivityContainers. 
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.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
 2014-02-11 14:47:48 -08:00
Dianne Hackborn
d9e385b111 Fix build. 
At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)
 2014-02-11 22:47:42 +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
Jean-Michel Trivi
ed8bb0159c Merge "AudioTrack JNI function rename" 2014-02-11 22:38:27 +00:00
Dianne Hackborn
32bb5fae35 Fix build. 
At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
 2014-02-11 14:22:14 -08:00
Griff Hazen
6adfd86ca9 am 4e795ebe: am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 
* commit '4e795ebe1783623a28a988f77b4f0f11d54e73be':
  Add local-only option to Notification (using flag)
 2014-02-11 21:40:48 +00: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
Griff Hazen
0ff811db58 Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 2014-02-11 21:26:53 +00:00
Jeff Sharkey
7b0e282715 Merge "First <provider> always wins." 2014-02-11 21:25:46 +00:00
Baligh Uddin
2e1ff903b8 Merge "Import translations. DO NOT MERGE" 2014-02-11 21:17:39 +00:00
Baligh Uddin
b444149134 Merge "Import translations. DO NOT MERGE" 2014-02-11 21:17:34 +00:00
Baligh Uddin
5e0a6f5264 Merge "Import translations. DO NOT MERGE" 2014-02-11 21:17:17 +00:00
Dianne Hackborn
47b80be208 am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'" 
* commit 'be49403a0362c18edaeafe59ac09baac14294dee':
  New command line tool 'idmap'
 2014-02-11 20:44:38 +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
Katie McCormick
43750f19e7 am b8645efb: am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit 'b8645efbc8b7f57168d1f5108b65e5bea576b1d1':
  Doc update: clarify best practices.
 2014-02-11 20:35:01 +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
Jeff Sharkey
c6809bb685 First <provider> always wins. 
In scanPackageLI(), the first provider to claim an authority wins
over any other later providers.  To match this behavior, this changes
ProviderIntentResolver to ignore later providers with the same
ComponentName.

Without this behavior, AM.getContentProvider() could end up wedged
waiting for a provider that generateApplicationProvidersLocked()
never decided to spin up.

Bug: 12956224
Change-Id: I37d3e6e9cf3eea2cac4c0e914134f6c83b2fc2bf
 2014-02-11 12:22:15 -08: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
Kenny Guy
826e51c4da Merge "Add concepts of related users and managed profiles to user manager." 2014-02-11 19:27:36 +00:00
Michael Wright
0d148c8b4e Merge "Move inputservice over to frameworks/native" 2014-02-11 19:09:12 +00:00
John Reck
9b6fa77518 Merge "Implement missing safelyRun() on ThreadedRenderer" 2014-02-11 18:55:46 +00:00
Michael Wright
d6b473713f Move inputservice over to frameworks/native 
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Try 2.

Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
 2014-02-11 10:47:36 -08:00
John Reck
fc53ef2779 Implement missing safelyRun() on ThreadedRenderer 
Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
 2014-02-11 10:40:25 -08:00
Eino-Ville Talvala
3b1da03c8b Merge "camera2: Clean up cross-references" 2014-02-11 17:57:08 +00:00
John Reck
f6eebb21d5 Merge "Refactor HardwareLayer" 2014-02-11 17:30:53 +00:00
Narayan Kamath
faa91f852e am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '86fb9904ad5760cb957782b45e96054c01fe4200':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 16:40:39 +00:00
Narayan Kamath
b1ed19a2ed am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
  Fix in MediaMuxer's JNI code
 2014-02-11 16:40:35 +00:00
Narayan Kamath
7f258f970e am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit 'a9d171bd5bab29feaef409489ed23d3c490285ce':
  Use long to store pointers in ConsumerIrService
 2014-02-11 16:40:31 +00:00
Narayan Kamath
a1cffb429c am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'd350af9695018e81f85600fb7dd906003cbaf62e':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 16:40:27 +00: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