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

32392 Commits

Author SHA1 Message Date
Chet Haase
9dc7d19309 am b4b0a7fe: am a1723d18: Merge "Revert "Remove ViewTreeObserver allocations"" into jb-dev 
* commit 'b4b0a7fea8735dc7de4bdcfe5e7f065a39ee8e2d':
  Revert "Remove ViewTreeObserver allocations"
 2012-06-07 11:34:52 -07:00
Chet Haase
b4b0a7fea8 am a1723d18: Merge "Revert "Remove ViewTreeObserver allocations"" into jb-dev 
* commit 'a1723d18662d1316f931a6b4b3ee6ddc42743ee4':
  Revert "Remove ViewTreeObserver allocations"
 2012-06-07 11:30:00 -07:00
Chet Haase
a1723d1866 Merge "Revert "Remove ViewTreeObserver allocations"" into jb-dev 2012-06-07 11:27:26 -07:00
Martijn Coenen
218eb9c03b am 57486f95: am fefd4896: Merge "Small NFC API docs addition." into jb-dev 
* commit '57486f9535ed3100a9b694e651ffe44ba0028544':
  Small NFC API docs addition.
 2012-06-07 10:41:15 -07:00
Martijn Coenen
57486f9535 am fefd4896: Merge "Small NFC API docs addition." into jb-dev 
* commit 'fefd48965c5f521f21c10aad86586cf68ae48f71':
  Small NFC API docs addition.
 2012-06-07 10:37:24 -07:00
Martijn Coenen
fefd48965c Merge "Small NFC API docs addition." into jb-dev 2012-06-07 10:35:15 -07:00
Chet Haase
89b8838496 am ca43c961: am 44b2fe3f: Track canvas clearing for swap buffers logic. 
* commit 'ca43c96127e9f7cdab8ee70638a2445347eebd08':
  Track canvas clearing for swap buffers logic.
 2012-06-07 09:51:07 -07:00
Chet Haase
ca43c96127 am 44b2fe3f: Track canvas clearing for swap buffers logic. 
* commit '44b2fe3fc114ee5f7273c6b0fee2cc999bf244a2':
  Track canvas clearing for swap buffers logic.
 2012-06-07 09:45:16 -07:00
Victoria Lease
29b9885c25 Merge "Fix hardcoded font path. Allow adding new font path thru Skia changes. Bug: 6609231" 2012-06-07 08:33:15 -07:00
Chet Haase
0f8ffd8374 Revert "Remove ViewTreeObserver allocations" 
This reverts commit b999cc118fe430699e9a67d5dab355125b873abb.

There was an assumption in this earlier change that observer dispatching could not be
recursive - we could only ever have one iteration on the observer listener list. This
assumption broke down in a specific app, and maybe in more, so reverting the change for now.
We should probably find a way to accomplish the same allocation-minimizing goal without
causing exceptions when violating our assumptions.

Issue #6620795 [Application compatibility] Lufthansa app crashes

Change-Id: I1c1f9ad329c14398feb0e74ce77e1a07111f7d1f
 2012-06-07 08:00:49 -07:00
Chet Haase
44b2fe3fc1 Track canvas clearing for swap buffers logic. 
A previous fix made it necessary for a frame to render something to GL
in order to cause a call to eglSwapBuffers(). Besides the calls being
tracked as part of issuing a DisplayList, there is also a potential call
to clear the canvas (via glClear()) on non-opaque surfaces. This call is also
good to track, since a surface that gets cleared without any other drawing operations
is worth flipping to the screen (to erase old contents on that surface).

This fix tracks the status of the pre-draw operations to find out whether
glClear() was called and then sets the drawing status appropriately.

Issue #6606422 QuickContact dismissal is janky again (Tracking)

Change-Id: I5fcaccfdc9293dd46b83f2fc279730a5d2740ebf
 2012-06-07 06:25:04 -07:00
Fabrice Di Meglio
e4beeb8e3c Merge "Make Spinner widget aware of layout direction" 2012-06-06 18:27:35 -07:00
Fabrice Di Meglio
38d64c5a95 Make Spinner widget aware of layout direction 
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I6ebeee67e3e34271897e14f73b7364b1ae83145a
 2012-06-06 18:19:51 -07:00
Christian Robertson
5f85a76e87 am 5cb84d2b: am 43fa4c52: Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev 
* commit '5cb84d2b1d7c89f7b1bdd42f94328bbd89a9d7ce':
  New mouse pointer arrow with high res versions. Bug: 6579869
 2012-06-06 18:02:45 -07:00
Christian Robertson
5cb84d2b1d am 43fa4c52: Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev 
* commit '43fa4c5261a732decae3bbfaea2a00f8bb9b709c':
  New mouse pointer arrow with high res versions. Bug: 6579869
 2012-06-06 17:58:55 -07:00
Christian Robertson
43fa4c5261 Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev 2012-06-06 17:56:36 -07:00
Martijn Coenen
3b6ecf0ec1 Small NFC API docs addition. 
Indicate that if the device does not support Bluetooth or WiFI,
calling the API is a no-op.

Bug: 6620788
Change-Id: Ib261e0e7855d0914e97803b3b808015b72f3a186
 2012-06-06 17:05:37 -07:00
Chris Craik
d2ce0bc723 am 0df6d579: am 37e0c368: Merge "Revert "Add temporary functor detach logging"" into jb-dev 
* commit '0df6d579dbe509c2d520c6f163ff2bafbd801208':
  Revert "Add temporary functor detach logging"
 2012-06-06 17:05:13 -07:00
Chris Craik
0df6d579db am 37e0c368: Merge "Revert "Add temporary functor detach logging"" into jb-dev 
* commit '37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d':
  Revert "Add temporary functor detach logging"
 2012-06-06 17:01:27 -07:00
Chris Craik
37e0c3681e Merge "Revert "Add temporary functor detach logging"" into jb-dev 2012-06-06 16:59:01 -07:00
Chris Craik
4e772cb938 am 6d99a024: am 8f1f714f: Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev 
* commit '6d99a024647ff845179311d611dcf031965ba96d':
  Revert "Add more temporary logging for investigating detachFunctor"
 2012-06-06 16:52:16 -07:00
Chris Craik
6d99a02464 am 8f1f714f: Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev 
* commit '8f1f714f831bf8bf10f94211c42e36ef2851810d':
  Revert "Add more temporary logging for investigating detachFunctor"
 2012-06-06 16:47:57 -07:00
Chris Craik
aa3b7d88ef Revert "Add temporary functor detach logging" 
bug:6608646

This reverts commit f98851ab37c07b243c485168cca201b07a22e6c7
 2012-06-06 16:45:53 -07:00
Chris Craik
8f1f714f83 Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev 2012-06-06 16:45:04 -07:00
George Mount
6b1e614f70 Merge "Fix scrolling behavior for text input and textarea." 2012-06-06 16:32:40 -07:00
Fabrice Di Meglio
a26ddfacd7 Merge "Remove dead code in Switch" 2012-06-06 15:56:36 -07:00
George Mount
c6c83ce475 Fix scrolling behavior for text input and textarea. 
Bug 6614784

Change-Id: I562a20e4cb07250794fc017e6d8b3885f7e8d6b8
 2012-06-06 14:57:01 -07:00
Dianne Hackborn
9a8eed3a4d am 18aa041a: am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev 
* commit '18aa041a62d36b9f2d4ead8ca0945ec87af582b4':
  Fix some divide by zero errors that could crash the system.
 2012-06-06 14:22:43 -07:00
Dianne Hackborn
18aa041a62 am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev 
* commit '6cd19e0266b3f4277f13dab7e9a86ebdd9905ee9':
  Fix some divide by zero errors that could crash the system.
 2012-06-06 14:17:54 -07:00
Dianne Hackborn
6cd19e0266 Merge "Fix some divide by zero errors that could crash the system." into jb-dev 2012-06-06 14:16:05 -07:00
Jake Hamby
f2fb9044c5 am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev 
* commit 'e60a35c156ac9a354ad6434da483b43af20ae4a2':
  DO NOT MERGE: Remove SMS shortcode warning feature.
 2012-06-06 14:04:07 -07:00
Chris Craik
932b7f6765 Revert "Add more temporary logging for investigating detachFunctor" 
bug:6608646

This reverts commit 8857b2f76abad1e4ec742dfd85d0c997880be376

Change-Id: I1563b5974c52b84201ae448298f804eb0dcc235d
 2012-06-06 14:02:55 -07:00
Jake Hamby
e60a35c156 Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev 2012-06-06 14:01:24 -07:00
Jake Hamby
004ff5ad2a DO NOT MERGE: Remove SMS shortcode warning feature. 
Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.

Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
 2012-06-06 13:56:50 -07:00
Eric Fischer
2c7f1325e1 am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev 
* commit '5ddf003cb2957672038bf1db397422402dce930a':
  Revert "Import translations. DO NOT MERGE"
 2012-06-06 13:54:56 -07:00
Eric Fischer
5ddf003cb2 Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev 2012-06-06 13:53:00 -07:00
Eric Fischer
25dcc321f7 Revert "Import translations. DO NOT MERGE" 
This reverts commit 6a6f746ece453c43aa92808cd140012866c8eb5c
 2012-06-06 13:51:50 -07:00
Dianne Hackborn
20e14948f2 am 82811d45: am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 
* commit '82811d45ed21ccdff77d11495fa2045c7942bd6d':
  Docs (mostly): enumerate JELLY_BEAN target SDK changes.
 2012-06-06 13:37:57 -07:00
Dianne Hackborn
82811d45ed am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 
* commit '533fce25a22718c491a86c31866b7751f1f582b7':
  Docs (mostly): enumerate JELLY_BEAN target SDK changes.
 2012-06-06 13:33:43 -07:00
Dianne Hackborn
533fce25a2 Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 2012-06-06 13:31:59 -07:00
Eric Fischer
8e62634acd am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '38987073c1b1a993a727210f981601217d30b899':
  Import translations. DO NOT MERGE
 2012-06-06 12:40:11 -07:00
Eric Fischer
404de74c49 Merge "Import translations. DO NOT MERGE" 2012-06-06 12:39:39 -07:00
Eric Fischer
38987073c1 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-06 12:37:51 -07:00
Eric Fischer
4328d8bb22 Import translations. DO NOT MERGE 
Change-Id: I531d75aff0713a0664110bf2c138305b30c84722
 2012-06-06 12:08:20 -07:00
Eric Fischer
6a6f746ece Import translations. DO NOT MERGE 
Change-Id: I5a8719c293a25460058ad5b62069ea80c33da110
 2012-06-06 12:02:00 -07:00
Dianne Hackborn
cdadee630e Fix some divide by zero errors that could crash the system. 
Change-Id: I66273df84e45de59b5b161f4d13de67a9e0f46d5
 2012-06-06 11:48:46 -07:00
Dianne Hackborn
636fd528f7 Docs (mostly): enumerate JELLY_BEAN target SDK changes. 
Okay this isn't entirely docs.  I have un-hidden the new permission
for binding to accessibility services; we were going to go out with
it hidden since it didn't go into factory ROM, but now that we are
doing other things we might as well expose it.

Also changed a log from E to W, since it is not an error.

Change-Id: I9226c95e3b63e12218fe41dc3f4290d9824a9e5c
 2012-06-06 11:36:49 -07:00
Svetoslav Ganov
5fccbbebdf am cf27a374: am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev 
* commit 'cf27a3743941d9ccb1d20a294085819049fac028':
  Removing leftover code to sync accessibility and input focus.
 2012-06-06 11:02:13 -07:00
Svetoslav Ganov
cf27a37439 am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev 
* commit '538252cd37945612a4761ff03d87022d56e33b96':
  Removing leftover code to sync accessibility and input focus.
 2012-06-06 10:57:50 -07:00
Svetoslav Ganov
538252cd37 Merge "Removing leftover code to sync accessibility and input focus." into jb-dev 2012-06-06 10:55:12 -07:00