20530 Commits

Author SHA1 Message Date
Mike Lockwood
f60ba87f07 DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
We need this to allow MTP to access secondary external storage devices

This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4.

Conflicts:

	data/etc/platform.xml

Change-Id: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
7ae938be1b DO NOT MERGE MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
d967f4664f DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:55 -04:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
2011-04-29 14:51:05 -07:00
Scott Main
ca7f30ebb2 am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit 'b8a57841316171d6db4311a65914720213516153':
  docs: add a little info to Configuration class description
2011-04-21 10:53:08 -07:00
Scott Main
63848e3df3 docs: add a little info to Configuration class description
Change-Id: I3278759bd1c323330c1143ef71d0644872caa085
2011-04-20 22:20:46 -07:00
Eric Fischer
b5b49ba8fc Import revised translations. DO NOT MERGE
Change-Id: I796dc2ad1556201f3b443b8185f5280cc8e1e213
2011-04-14 13:59:43 -07:00
Xia Wang
46b59ef01b Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 2011-04-13 15:13:10 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Xia Wang
dddfaa75e7 Fix access point parsing: reset static link property after parsing
static ip setting
Fix removeConfiguredNetwork: add sleep between remove configured network
and disable wifi

Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
2011-04-08 16:31:01 -07:00
Nicolas Roard
fcba23536b Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 2011-04-07 17:21:53 -07:00
Nicolas Roard
4bae836784 Remove uncalled function -- java counterpart of
the fix for bug:4183801

Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a
2011-04-07 15:04:26 -07:00
Teng-Hui Zhu
2fcf82aee3 DO NOT MERGE : cherry pick of change Ieb7ae26b from master
Buffering in full screen mode will show progressView

bug:4187252
Change-Id: Ia44d880ab126c2439fb13504db87492d45c90bc8
2011-04-07 09:14:16 -07:00
Teng-Hui Zhu
a9cadefde4 DO NOT MERGE : cherry pick of change I0f9f2c65 from master
Add the loading progress UI when buffering

bug:4187252
Change-Id: Ifbf63b248ac5f0e340be4057e0dcd80d33483662
2011-04-07 09:14:05 -07:00
Teng-Hui Zhu
b25181aacc Merge "Fix the issue the video can't start to play" into honeycomb-mr1 2011-04-07 08:52:45 -07:00
Teng-Hui Zhu
0504967cb0 Fix the issue the video can't start to play
In full screen mode, we shall not always rely on the auto start info.
If the auto start is false, it will prevent the video from playing.

The auto start should always happen inline mode when prepared.
If we switch into full screen mode while playing, we will also do auto start.

bug:4260063
Change-Id: I4b13c30b1f2c219951dc8edd659e221a21c86c2b
2011-04-06 18:20:19 -07:00
Eric Fischer
6d5f5faae0 Import revised translations. DO NOT MERGE
Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
2011-04-06 13:47:57 -07:00
Adam Powell
030b38ffc2 Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 2011-04-05 10:45:25 -07:00
Adam Powell
3c534772de Fix bug 4207704 - Gestures can be lost when Flash is enabled
Pre-queue WebView touch events as we send them to webkit so that we
can run them through WebView later if webkit or hosted plugins go out
to lunch.

Change-Id: Id4e9f56beeb0c1d55e77233423844b15f6f00aef
2011-04-04 22:06:50 -07:00
Robert Ly
3f39f653a9 Adding package description for android.hardware.usb
Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
2011-04-04 11:07:46 -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
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
c7de6dd483 Replacing browser playback controls for inactive videos
Bug: 4136024

Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
2011-03-30 14:21:28 -07:00
Eric Fischer
df491490a6 Import revised translations. DO NOT MERGE
Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d
2011-03-29 13:26:46 -07:00
Eric Fischer
627e59ad08 Import revised translations. DO NOT MERGE
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
2011-03-29 11:58:23 -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
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
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
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
5e66ccf5c4 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Eric Fischer
3a2575f7e6 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -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
039aa81a67 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -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
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
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
b02d395650 am e16a1bfa: Use system locale list.
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
  Use system locale list.
2011-03-18 11:23:00 -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
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