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

125076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
47b32a0be1 Merge "Add support for injecting events into ActivityContainers." 2014-02-12 00:35:08 +00:00
Qiwen Zhao
9615cca99b reset to master at 340312e with history 2014-02-11 15:03:02 -08: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
Chris Wren
464c7efcbc use private notification for the heads up 
HUN only shows if the device is on and unlocked

Change-Id: Ib3f11bb9267b95c88ddb8bef0b321db79d68841b
 2014-02-11 16:50:43 -05:00
Chris Wren
f29c3b4997 explicitly handle clicks on the heads up notification 
Bug: 11900055
Change-Id: I45c955f7ac91dc9f59528e382e9df490f0f96be5
 2014-02-11 16:49:52 -05: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
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
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
Qiwen Zhao
f3797327f9 Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova 2014-02-11 10:59:34 -08:00
John Reck
75d8f20b9b am 9b6fa775: Merge "Implement missing safelyRun() on ThreadedRenderer" 
* commit '9b6fa7751864452d821059dc55c6d86f9011ee63':
  Implement missing safelyRun() on ThreadedRenderer
 2014-02-11 10:58:59 -08:00
Qiwen Zhao
646038e601 Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova 2014-02-11 10:57:47 -08:00
Qiwen Zhao
13f0a3a43d reset to master for this file since it is missing an older change. 2014-02-11 10:56:43 -08: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
c737d5c7f9 am 3b1da03c: Merge "camera2: Clean up cross-references" 
* commit '3b1da03c8b9b569759e2d6ffee7cbdea7ff7fa32':
  camera2: Clean up cross-references
 2014-02-11 10:28:06 -08:00
Qiwen Zhao
6ec42ac6b7 Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova 2014-02-11 10:26:37 -08:00
Qiwen Zhao
dc8d416578 Merge commit 'f6eebb21' into master-nova 
Conflicts:
	core/java/android/view/GLES20Layer.java
	core/jni/android_view_GLES20Canvas.cpp
 2014-02-11 10:25:59 -08:00
Eino-Ville Talvala
3b1da03c8b Merge "camera2: Clean up cross-references" 2014-02-11 17:57:08 +00:00
Narayan Kamath
912524f9dc am faa91f85: am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit 'faa91f852e9526b2f112122da9ae0956526cf662':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 09:49:11 -08:00
Narayan Kamath
f488e8c0a4 am b1ed19a2: am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit 'b1ed19a2ed1739c0d415cc81a3b7c458307694ab':
  Fix in MediaMuxer's JNI code
 2014-02-11 09:49:08 -08:00
Narayan Kamath
dfc99fe251 am 7f258f97: am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit '7f258f970e2123131638665c9d6674a7e1c7e4ea':
  Use long to store pointers in ConsumerIrService
 2014-02-11 09:49:05 -08:00
Narayan Kamath
2a602688fb am a1cffb42: am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'a1cffb429c57eb961282160ae4631d70bfa55204':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 09:49:02 -08:00