36209 Commits

Author SHA1 Message Date
Joe Onorato
fd52b18d9b The beginnings of the new status bar.
There is a lot of rough stuff still, but most of the functionality is here again.

Change-Id: I4b1241e61270f1434e798481afa83634233ee670
2010-11-15 11:52:33 -08:00
Andreas Huber
645336a742 Merge "More HTTP live support, AES encryption etc." 2010-11-15 10:07:38 -08:00
Andreas Huber
d98f49b014 Merge "Refactor h.264 profile/level support into avc_utils." 2010-11-15 10:07:31 -08:00
Andreas Huber
ffd998e744 Merge "Provide bandwidth estimation support in NuHTTPDataSource" 2010-11-15 10:07:24 -08:00
Andreas Huber
81a602958f Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser." 2010-11-15 10:07:17 -08:00
Adam Cohen
c86b5a6af9 Merge "Adding click feedback to StackView" 2010-11-15 10:05:58 -08:00
James Dong
93248f8160 Merge "Remove legacy PV stuff" 2010-11-15 09:57:33 -08:00
Mike Lockwood
5d5b0a32a9 Merge "MTP: Partial implementation of the GetObjectPropList command" 2010-11-15 09:51:10 -08:00
Bryan Mawhinney
c0aaccc485 Add support for integer mod.
Change-Id: I681b8220c8b39d865ade036a93ba93a965e259c9
2010-11-15 17:43:12 +00:00
Andreas Huber
2381a8a91b Provide bandwidth estimation support in NuHTTPDataSource
Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29
related-to-bug: 2368598
2010-11-15 09:35:54 -08:00
Justin Ho
e70e78103a am b9d3e359: (-s ours) am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
* commit 'b9d3e35907e6b7e2c766f4813ab2e0463c920c37':
  DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:16:13 -08:00
Justin Ho
b9d3e35907 am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
* commit '868889fb4175979ef9aa505fc746bf616f54ed10':
  DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:13:16 -08:00
Justin Ho
868889fb41 Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread 2010-11-15 09:10:33 -08:00
Justin Ho
ee6aa806d8 DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
Change-Id: I6220c0b9f85b20c690437a23c364ad4898b8e16a
2010-11-15 09:07:34 -08:00
Andreas Huber
6a1f5f90e4 More HTTP live support, AES encryption etc.
Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c
related-to-bug: 2368598
2010-11-15 09:03:03 -08:00
Andreas Huber
f7e2e31f7a Refactor h.264 profile/level support into avc_utils.
Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358
related-to-bug: 2368598
2010-11-15 09:01:13 -08:00
Justin Ho
5b4faa4da0 am dc04f537: (-s ours) am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
* commit 'dc04f53703f68f0a4fb13858cbf71b760cf48368':
  DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:57:11 -08:00
Andreas Huber
5dffd0e3af Add http live mime types to MediaFile, add support for playlist mime types to browser.
Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
2010-11-15 08:54:40 -08:00
Justin Ho
dc04f53703 am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
* commit 'a5c4aeba1cb53775bdb5622569ffe53641f4728d':
  DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:53:56 -08:00
Justin Ho
a5c4aeba1c Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread 2010-11-15 08:50:19 -08:00
Mike Lockwood
e2ad6ec171 MTP: Partial implementation of the GetObjectPropList command
In this initial implementation we only support fetching one property at a time.
Support depth = 0 (single object) or depth = 1 (all objects in a directory)
Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former
is a special case of the latter.

Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-11-15 11:46:51 -05:00
Justin Ho
1b35a52263 DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
Change-Id: I5c7fc73f28408e6345bb9a73f0fe10014a26efbf
2010-11-15 08:41:16 -08:00
Mike Lockwood
44d47ad565 Merge "MediaScanner: Add support for importing file based playlists copied over MTP" 2010-11-15 08:39:00 -08:00
James Dong
8ec2d9add9 Remove legacy PV stuff
Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
2010-11-15 08:36:42 -08:00
James Dong
98d50a0be8 Merge "Disable flaky streaming server check" 2010-11-15 08:13:30 -08:00
James Dong
797fe92132 Merge "Fix a typo in LOG_TAG for MediaPlayer unit tests" 2010-11-15 08:11:32 -08:00
Patrick Scott
c12544a201 Offer a callback to intercept url requests.
The new callback allows applications to return a response for a particular url.
Deprecate onLoadResource in favor of the new api.  onLoadResource is not
currently being used by the new network stack and applications can post a
message from shouldInterceptRequest to handle onLoadResource.

Bug: 2905943
Change-Id: Icf48ab3110d85d76112b3c3b4a1a8c8a333b82f0
2010-11-15 09:19:38 -05:00
Iain Merrick
83d4a23c28 Provide default error strings in BrowserFrame.onReceivedError().
This method is called from both the Android and Chrome HTTP stacks.
We want the same user-facing behaviour in each case, but the Chrome
code does not have easy access to the same error message strings.

Therefore, I'll have the Chrome HTTP stack provide empty strings
for the descriptions. (See change I9042a2ee in external/webkit).

This CL makes BrowserFrame check for empty or null strings and use
the standard error messages instead.

The strings were package-private, so I did a little cleaning up
to make them public (but still hidden from the API). Using a switch
statement instead of an array because it's more robust and should
be comparably efficient.

Bug: 3172265
Test: Load http://google.com:81 to force a timeout error, check
that the correct message is displayed.

Change-Id: I7dec8dffe8ad9e513fdb90877e0b466e707174a8
2010-11-15 11:18:39 +00:00
Ben Murdoch
2f3496b424 Merge "Stop loading if the user cancels the SSL certificate warning dialog" 2010-11-15 02:33:50 -08:00
James Dong
2fd4e5935c Fix a typo in LOG_TAG for MediaPlayer unit tests
Change-Id: I351f32fe4b4da82c32acf5c9e5ebdb81bb003525
2010-11-14 14:56:56 -08:00
Dianne Hackborn
7eec10e6c9 Get rid of the extended themes.
We now decide whether to use a bitmap background based on whether the
window's drawing is hardware accelerated.  To do this, there is a new
"state_accelerated" that state list drawables can be parameterized on,
and the standard window background uses this to select a solid color
or bitmap drawable as appropriate.

Introduces a little hackery to have wm preview windows pretend like
they are hardware accelerated even if they aren't, so the preview looks
closer to the actual app.

Also Add a DialogWhenLarge variation for the light theme.

Change-Id: I215a79d5df65ba3eed52ab363cade9d8218a6588
2010-11-14 14:23:42 -08:00
Brad Fitzpatrick
7c2ae65703 Fix CloseGuard/StrictMode integration.
Change-Id: Ib89843c48b92138d3981f0f719eae28bf44e2ed4
2010-11-14 11:00:05 -08:00
James Dong
a76e7efde8 Disable flaky streaming server check
o Although the streaming server is available, the check fails most of the time.

Change-Id: I1084e715605541c4fc3d40e4055db90ddb118b6f
2010-11-13 15:22:55 -08:00
Adam Powell
6e1a56d6c8 Merge "Revised assets for progress bars and indeterminate progress spinners." 2010-11-12 19:19:19 -08:00
Megha Joshi
58c492f2ae am 7bcccece: (-s ours) am e2ef2c10: Fixing build (DO NOT MERGE)
* commit '7bcccece88734fb714c417d9d263065212f59d24':
  Fixing build (DO NOT MERGE)
2010-11-12 19:16:06 -08:00
Megha Joshi
7bcccece88 am e2ef2c10: Fixing build (DO NOT MERGE)
* commit 'e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
  Fixing build (DO NOT MERGE)
2010-11-12 19:13:35 -08:00
Megha Joshi
e2ef2c10e7 Fixing build (DO NOT MERGE)
Change-Id: I27fb9dc0584940e119b030d63ff5781ef19001c1
2010-11-12 19:09:11 -08:00
Adam Powell
6af97e1c20 Revised assets for progress bars and indeterminate progress spinners.
Add support in ActionBar for activity-wide progress APIs.

Add ability for progress bars to set a target framerate rather than
the 5fps previously used.

Clean up some more dialog layouts using hardcoded styles rather than
theme attributes.

Change-Id: I8e88c7595e27c0b6f7829b598f2b084ac8501ae3
2010-11-12 19:06:40 -08:00
Megha Joshi
95483c92f4 am 7e059716: (-s ours) am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '7e059716923cd02a4c42751c67892e090bfd5f33':
  Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:48:56 -08:00
Megha Joshi
7e05971692 am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
  Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:46:38 -08:00
Megha Joshi
48c698fc14 Adding NFC sample resources (DO NOT MERGE)
Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
2010-11-12 18:35:49 -08:00
Dianne Hackborn
55d3bae235 Merge "Change recents UIs to do task switches." 2010-11-12 18:18:15 -08:00
satok
b66d287e30 Add a setter of InputMethodSubtype to InputMethodManager
- Public API: void setCurrentInputMethodSubtype(int pos)

Change-Id: I55daa19ba924999def544bf841f00bf54852f3e1
2010-11-13 09:49:59 +09:00
satok
03eb319a3a Reset IME to the build-in IME when there is something wrong with the current IME.
Bug: 3186000

- By this change, there will be no need to find new applicable IME in Settings application
- This change handles the edge case that there is something wrong with the current IME

Change-Id: Idb42b6184ac135370064b967305faa81f1b382b2
2010-11-13 09:30:50 +09:00
Brian Muramatsu
5c5dfd0aa5 Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict" 2010-11-12 15:55:14 -08:00
Vasu Nori
54511bb6e4 Merge "remove unnecessary code from DownloadManager" 2010-11-12 15:46:25 -08:00
Gil Dobjanschi
bbced1b9e9 Merge "Transition invalidation bug fix." 2010-11-12 15:39:16 -08:00
James Dong
a9d02bf602 Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h" 2010-11-12 15:33:41 -08:00
Gil Dobjanschi
75159247d8 Transition invalidation bug fix.
Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
2010-11-12 15:29:57 -08:00
Mike Lockwood
caf7e43a40 MediaScanner: Add support for importing file based playlists copied over MTP
Change-Id: I53a9f204297ff29d4df994d2174bd6d6288f2c97
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-12 18:23:19 -05:00