Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,673 Commits 3 Branches 0 Tags
ae082c9a2dc259fe2bb89ba07aed2c555ea1be8d
Commit Graph

60673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
ae082c9a2d am 55b039f1: Merge "Support for correctly scaling text selection handles" 
* commit '55b039f1b7ecb0439e095082e82c4d4fa2627921':
  Support for correctly scaling text selection handles
 2011-09-28 11:39:10 -07:00
John Reck
55b039f1b7 Merge "Support for correctly scaling text selection handles" 2011-09-28 11:11:57 -07:00
Steve Block
64da6a61b8 am 0a20d6a4: Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 
* commit '0a20d6a4c3474ec6582b7cd9db3d996563403a71':
  Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set
 2011-09-28 10:14:00 -07:00
Steve Block
0a20d6a4c3 Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 2011-09-28 10:11:55 -07:00
Elliott Hughes
bee78ca71d am 87e12b05: Merge "Add ICS-specific notes to the JNI tips documentation." 
* commit '87e12b05f1260413e42fa43e58865e437f3d2027':
  Add ICS-specific notes to the JNI tips documentation.
 2011-09-28 09:58:05 -07:00
Elliott Hughes
87e12b05f1 Merge "Add ICS-specific notes to the JNI tips documentation." 2011-09-28 09:56:11 -07:00
Marco Nelissen
2c22603d28 am 8df38890: Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634" 
* commit '8df38890d4634aec70c5d37bc90a3a2f836f8aa1':
  Log a warning when a MediaPlayer is finalized without having being released. b/5382634
 2011-09-28 09:42:53 -07:00
Marco Nelissen
8df38890d4 Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634" 2011-09-28 09:41:12 -07:00
Marco Nelissen
8dc208476f Log a warning when a MediaPlayer is finalized without having being released. 
b/5382634

Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
 2011-09-28 09:21:11 -07:00
Brian Colonna
34279fbf8f am 9a3d51ed: Merge "Added landscape views for Face Unlock" 
* commit '9a3d51ed1090d459666c3257923b16eca842bb10':
  Added landscape views for Face Unlock
 2011-09-28 06:16:19 -07:00
Brian Colonna
1653f83e38 am 0c66f052: Merge "Fix 5323545 - FaceLock no longer appears when taking a call" 
* commit '0c66f0526751ad3f97636b834ea957659a65048b':
  Fix 5323545 - FaceLock no longer appears when taking a call
 2011-09-28 06:16:18 -07:00
Brian Colonna
9a3d51ed10 Merge "Added landscape views for Face Unlock" 2011-09-28 06:13:53 -07:00
Brian Colonna
0c66f05267 Merge "Fix 5323545 - FaceLock no longer appears when taking a call" 2011-09-28 06:13:44 -07:00
Chih-Chung Chang
da7b1231b5 am d83baa4e: Merge "Fix 5158468: Update floating window size when the anchor view size changes." 
* commit 'd83baa4ef3a2903214ea9b5c943db67751858e90':
  Fix 5158468: Update floating window size when the anchor view size changes.
 2011-09-28 04:49:16 -07:00
Chih-Chung Chang
d83baa4ef3 Merge "Fix 5158468: Update floating window size when the anchor view size changes." 2011-09-28 04:48:06 -07:00
Flavio Lerda
e45f2e18e0 am d0bc6afb: Merge "Do not format numbers starting with hash or star." 
* commit 'd0bc6afbbd8d9cdb2fecb8ce88c5ee85d95c3e1f':
  Do not format numbers starting with hash or star.
 2011-09-28 04:43:44 -07:00
Flavio Lerda
d0bc6afbbd Merge "Do not format numbers starting with hash or star." 2011-09-28 04:38:00 -07:00
Chih-Chung Chang
85d4ea6fe4 Fix 5158468: Update floating window size when the anchor view size changes. 
Originally when surfaceChanged() happens, we remove the old window and
create a new window. This causes flickering. Now we just update the window
layout according to the size of the anchor view.

Change-Id: Id741dac07872e473f2c9829b626c5c9568e7e22d
 2011-09-28 18:00:29 +08:00
Steve Block
38256165a2 am aae19fb9: Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack" 
* commit 'aae19fb90c9af3be4b0ef956940b7ef8afc37b0f':
  Hook up WebView.clearSslPreferences() for the Chromium HTTP stack
 2011-09-28 02:47:22 -07:00
Steve Block
aae19fb90c Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack" 2011-09-28 02:45:28 -07:00
Steve Block
a0d767c822 Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set 
This makes sure that the page's SSL certificate is cleared when the page load
starts.

Follows on from https://android-git.corp.google.com/g/#/c/138147.

Bug: 5287216
Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
 2011-09-28 10:44:11 +01:00
Kristian Monsen
d9151bf1cc Hook up WebView.clearSslPreferences() for the Chromium HTTP stack 
Note that this is an incomplete fix, as we do not clear the responses for
connections currently in use, as they maintain their own cache. See
http:/b/5324235.

Bug: 5287216
Change-Id: I18f6638efeff0bee1e7ffed606be1444d683bebd
 2011-09-28 10:44:11 +01:00
Mathew Inwood
e27d7e8630 am d0e8fb43: Merge "Document thrown IllegalArgumentException." 
* commit 'd0e8fb431ac9c1fcc2f5b0eba884d29fc57a4cf1':
  Document thrown IllegalArgumentException.
 2011-09-28 01:22:27 -07:00
Mathew Inwood
d0e8fb431a Merge "Document thrown IllegalArgumentException." 2011-09-28 01:20:04 -07:00
John Reck
1cfe8ddf62 Support for correctly scaling text selection handles 
Bug: 5367280

Change-Id: If32fdc9cd82d1a66bc96446a123c44d9edd9d340
 2011-09-27 20:14:39 -07:00
Fabrice Di Meglio
737f03143b am 8f0bb4bc: Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs" 
* commit '8f0bb4bc1715ad9aaa486d010ea870ec2f43d245':
  Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs
 2011-09-27 19:32:48 -07:00
Guang Zhu
e18da5479a am 25438e21: Merge "Use CPU upload path in DRT" 
* commit '25438e2199fe0083639c76311d698a0a20446349':
  Use CPU upload path in DRT
 2011-09-27 19:32:45 -07:00
Romain Guy
217be64139 am 816b776b: Merge "Add a bit more doc to TextureView" 
* commit '816b776be13ae6c38b49ec982b317b9bae46a1b2':
  Add a bit more doc to TextureView
 2011-09-27 19:32:37 -07:00
Romain Guy
63f462bba1 am fd9932d1: (-s ours) am 0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge. 
* commit 'fd9932d15313c10e09e4d81b37f87defd9490827':
  CherryPick 043a6b from master: do not merge.
 2011-09-27 19:32:33 -07:00
Jesse Wilson
ce1eb2c128 am 70980383: Merge "Test to demonstrate NPE in DefaultRequestDirector" 
* commit '70980383decd0d7c2928d1950482c388467785e5':
  Test to demonstrate NPE in DefaultRequestDirector
 2011-09-27 19:32:21 -07:00
Xavier Ducrohet
7393f8f37c am 05aa1fef: Merge "Don\'t use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #5352896" 
* commit '05aa1fef932c2f2cb22ac8d75fee4ac507a32a69':
  Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #5352896
 2011-09-27 19:20:29 -07:00
Andreas Huber
9669fab20d am d4fb497c: Merge "Cut down on AwesomePlayer and OMXCodec\'s verbosity." 
* commit 'd4fb497cf4606abf61ec690ed971523ff9d05eac':
  Cut down on AwesomePlayer and OMXCodec's verbosity.
 2011-09-27 19:20:19 -07:00
Peter Ng
bf4fbb3479 am f7def664: Merge "Lockscreen handle is now a locked icon and not an unlocked" 
* commit 'f7def664803fab622d22c806de24424cceb8c0c6':
  Lockscreen handle is now a locked icon and not an unlocked
 2011-09-27 19:20:16 -07:00
Fabrice Di Meglio
8f0bb4bc17 Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs" 2011-09-27 18:45:57 -07:00
Guang Zhu
25438e2199 Merge "Use CPU upload path in DRT" 2011-09-27 18:27:36 -07:00
Guang Zhu
ef4d25c885 Use CPU upload path in DRT 
This makes it the same as default browser settings (for now). Otherwise
the test may crash due to GPU OOM.

This is to be a workaround only, and should be reverted after the bug is
fixed.

Bug: 5382134

Change-Id: I82a8dd83b69c8fceb657af9e32a2c5fa66ead2ce
 2011-09-27 18:23:10 -07:00
Romain Guy
816b776be1 Merge "Add a bit more doc to TextureView" 2011-09-27 17:45:46 -07:00
Romain Guy
462785fa25 Add a bit more doc to TextureView 
Change-Id: Ib76c80d8f70ede1bb63db319bca1e93c489def4d
 2011-09-27 17:42:10 -07:00
Romain Guy
fd9932d153 am 0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge. 
* commit '0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde':
  CherryPick 043a6b from master: do not merge.
 2011-09-27 16:44:28 -07:00
Jesse Wilson
70980383de Merge "Test to demonstrate NPE in DefaultRequestDirector" 2011-09-27 16:31:10 -07:00
Jesse Wilson
de5d7d2508 Test to demonstrate NPE in DefaultRequestDirector 
When the HTTP client encountered a server failure while
talking through a proxy, it fails with an NullPointerException
and not an IOException.

Change-Id: I4b287105bf78b832d034557e37e74ce576c7894d
Bug: http://b/5372438
 2011-09-27 19:28:32 -04:00
Elliott Hughes
868d74eb3f Add ICS-specific notes to the JNI tips documentation. 
Change-Id: I9be8f2452063363d9f2b6c28b5a2eacac09308a1
 2011-09-27 16:27:31 -07:00
Romain Guy
0e8fb15da2 CherryPick 043a6b from master: do not merge. 
Don't use OpenGL ES 2.0 to render the wallpaper on the emulator.
Bug #5352896

The emulator doesn't support OpenGL ES 2.0.

Change-Id: I3d60f8e4b5c5431e9e21471c576f4a9382f4693f
 2011-09-27 15:59:53 -07:00
Xavier Ducrohet
05aa1fef93 Merge "Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #5352896" 2011-09-27 15:47:55 -07:00
Romain Guy
043a6b1e57 Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. 
Bug #5352896

The emulator doesn't support OpenGL ES 2.0.

Change-Id: I7f647d78d4d8ad87d12a5f009d5d37f6aeaecf72
 2011-09-27 15:37:54 -07:00
Andreas Huber
d4fb497cf4 Merge "Cut down on AwesomePlayer and OMXCodec's verbosity." 2011-09-27 15:26:43 -07:00
Peter Ng
f7def66480 Merge "Lockscreen handle is now a locked icon and not an unlocked" 2011-09-27 15:07:39 -07:00
Andreas Huber
262d7e8e21 Cut down on AwesomePlayer and OMXCodec's verbosity. 
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug: 5382014
 2011-09-27 15:07:36 -07:00
Eric Fischer
8ac7619137 am 9ee0865a: (-s ours) am ce9756d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '9ee0865ac3aad3a15a1b2bce1f6f6eb39c615dee':
  Import revised translations.  DO NOT MERGE
 2011-09-27 14:58:01 -07:00
Peter Ng
6cf2c642b6 Lockscreen handle is now a locked icon and not an unlocked 
Bug: 5231211
Change-Id: I4ee84d142d972c42ec5f28ed921a2edadf11adf7
 2011-09-27 14:55:51 -07:00