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

20705 Commits

Author SHA1 Message Date
Mike Lockwood
38f04c0f28 am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:34:39 -07:00
Mike Lockwood
11dd5ae97b Improve Javadoc for USB Manager and MTP/PTP support. 
Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-01 14:11:50 -04:00
Dianne Hackborn
a5b308e74c am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:50:29 -07:00
Dianne Hackborn
53df89c74f Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 2011-03-30 17:43:17 -07:00
Dianne Hackborn
2f98f26708 Expand screen documentation with explicit screen size dimensions. 
This updates the various documentation on screen sizes to discuss
the exact screen dimensions that are now associated with each size.
In addition, the screen sizes vs. densities table is updated to
include a number of additional representative screens.

Change-Id: Id07491148b1857e0265cef7139e564e190f38e03
 2011-03-30 16:19:02 -07:00
Justin Ho
0b251aec43 am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 15:59:19 -07:00
Justin Ho
c7de6dd483 Replacing browser playback controls for inactive videos 
Bug: 4136024

Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
 2011-03-30 14:21:28 -07:00
Eric Fischer
bc2489e4c5 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:20:42 -07:00
Eric Fischer
627e59ad08 Import revised translations. DO NOT MERGE 
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
 2011-03-29 11:58:23 -07:00
Adam Powell
c8c78eed52 am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:45:06 -07:00
Adam Powell
baa3380d74 Fix bug 4170809 - Pages with flash lose touch events 
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.

Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
 2011-03-25 13:58:19 -07:00
Teng-Hui Zhu
a7605d3b2e am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit '2d09b855d5c0749ab845d3f2775125fea294f07c':
  When the video is not on the front, it should be paused
 2011-03-23 17:34:15 -07:00
Teng-Hui Zhu
1e26d82ffa When the video is not on the front, it should be paused 
bug:4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
 2011-03-23 16:56:12 -07:00
Teng-Hui Zhu
503735099d am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit 'efb8eda41a2dce03db0984c490c16f6a32867ded':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:06:10 -07:00
Teng-Hui Zhu
efb8eda41a Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 2011-03-23 16:03:04 -07:00
Teng-Hui Zhu
2deec6651c Make sure the full screen playing continue when timeout 
bug:4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
 2011-03-23 15:29:22 -07:00
Scott Main
ee7cfaf289 am 18cd686f: am ef6b305b: docs: fix markup error 
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
  docs: fix markup error
 2011-03-23 14:43:35 -07:00
Scott Main
18cd686fc8 am ef6b305b: docs: fix markup error 
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
  docs: fix markup error
 2011-03-23 14:32:44 -07:00
Scott Main
ef6b305b93 docs: fix markup error 
Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
 2011-03-23 14:23:02 -07:00
Eric Rowe
22e21da663 am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.
 2011-03-22 18:59:00 -07:00
Eric Rowe
5e66ccf5c4 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Eric Fischer
b05f0b84b2 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
 2011-03-22 13:59:20 -07:00
Eric Fischer
3a2575f7e6 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
2c6f2816d7 am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
 2011-03-22 13:56:35 -07:00
Eric Fischer
765ae04f61 Import revised translations. DO NOT MERGE 
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
 2011-03-22 13:38:10 -07:00
Teng-Hui Zhu
158fbdb29b fix for pause when loading 
bug:4148903

Change-Id: Ib0b59c8c36eb5df8c6755156a5d2753f84ad9677
 2011-03-22 12:02:11 -07:00
Teng-Hui Zhu
f2c44a79d9 am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash
 2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
039aa81a67 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Justin Ho
6a21161095 am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
  Fixing list selector theme Bug: 4147203
 2011-03-21 17:59:59 -07:00
Teng-Hui Zhu
cd44562455 Fix a crash 
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
 2011-03-21 17:38:21 -07:00
Justin Ho
9db9a7d3f4 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Justin Ho
c16168091a Fixing list selector theme 
Bug: 4147203

Change-Id: Ib9052ca399a135d42fd5c6ccf2bea8babfe8f0ac
 2011-03-21 15:04:23 -07:00
Teng-Hui Zhu
f82e5a2c90 am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
  Support loading image and paused image for inline video
 2011-03-21 14:19:29 -07:00
Teng-Hui Zhu
265db32f31 Support loading image and paused image for inline video 
bug:4142131

Change-Id: I28d82a8e30a2146a3380c63dcdcbd51228f23f56
 2011-03-21 10:36:00 -07:00
Eric Rowe
2b1fb45fab Clean up BT stress tests. 
Make ConnectPanReceiver a child of ConnectProfileReceiver, check if a
profile proxy is null before trying to connect.  Change log output in
bluetooth.  Remove some oververbose parameters from test runner. Make
the setup for the tests more consistent (delete pairings, etc).

Most of this work has been done to facilitate the tests created for
trade federation.

Change-Id: I7350d308b5d09c2052e0a3f3308a69c564ba4d74
 2011-03-18 20:13:11 -07:00
Teng-Hui Zhu
eb52fb3229 am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1 
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
  Asset for video poster
 2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
7eaf483140 Merge "Asset for video poster" into honeycomb-mr1 2011-03-18 15:19:28 -07:00
Teng-Hui Zhu
70455a194e Asset for video poster 
bug:4136024

Change-Id: I2b847948446285a2121578a4809f90a48d0c6019
 2011-03-18 15:01:34 -07:00
Daisuke Miyakawa
10221a22dd am b02d3956: am e16a1bfa: Use system locale list. 
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
  Use system locale list.
 2011-03-18 11:27:22 -07:00
Daisuke Miyakawa
b02d395650 am e16a1bfa: Use system locale list. 
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
  Use system locale list.
 2011-03-18 11:23:00 -07:00
Derek Sollenberger
25dad8eda1 am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1 
* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
  Prevent intermediate scale updates from being sent to WebKit while zooming.
 2011-03-18 11:02:45 -07:00
Derek Sollenberger
a249a93e8d Prevent intermediate scale updates from being sent to WebKit while zooming. 
The addition of the HW accelerated logic causes us to manipulate the
zoom scale factor in the zoom manager two additional times. These
manipulations occur after the mZoomScale has been set to zero is how we
previously tested to see if a fixed length animation was occuring.

bug: 3451126
Change-Id: If2992adbe36fa471bb1bb5013495e1adc74b5fab
 2011-03-18 12:48:36 -04:00
Daisuke Miyakawa
e16a1bfa9c Use system locale list. 
Context's assets may be different from system's. We should
prefer system's to reflect PRODUCT_LOCALE.

Bug: 4104675
Change-Id: I968c3baf6bfeb945f1b71ec709d5088332482319
 2011-03-17 19:56:13 -07:00
Dianne Hackborn
efb56934ef am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:02:15 -07:00
Dianne Hackborn
1d50ad7914 Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 2011-03-17 19:00:56 -07:00
Dianne Hackborn
edf1fc6ce6 Whoops, forgot the HONEYCOMB_MR1 constant. :( 
It shouldn't be a problem to put this in -- it is a static final
so it doesn't actually need to be in the on-device system image.

This is important for the SDK.

Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
 2011-03-17 18:34:48 -07:00
Huahui Wu
d1e89c412f am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
  b/4116658 Fix the jumpy scrolling with some flash site.
 2011-03-17 18:11:04 -07:00
Huahui Wu
b1c43c32f5 Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 2011-03-17 18:09:33 -07:00
Justin Ho
dd8f926841 am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 17:55:58 -07:00
Huahui Wu
88b869a40a b/4116658 Fix the jumpy scrolling with some flash site. 
In the case that a touch event is passed to WebKit then back to
WebView, the coordinates will be converted from view to content
then back to view and the convertion could lose some accuracies.
For a flash content that only consumes TouchDown, all the
TouchMove events will go through this path and each time, the
data becomes more inaccurate. Even worse, the TouchMove event
updates the mScrollX/Y which will then be used for the convertion.
The effect amplifies really quick and the scrolling looks jumpy.

The fix is just to store the original view coordinates when pass
the event around.

Change-Id: Ie1424d7cfc6272348b194732e97168efe2dcf17b
 2011-03-17 17:42:12 -07:00