36350 Commits

Author SHA1 Message Date
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
Brad Fitzpatrick
4d9e6d2bc2 Disable CloseGuard early. (it defaults to spammy otherwise)
We already selectively enable it later when desired.

Change-Id: Ic428f13a57a2b4340ce343e73c32413b64fcd1af
2010-11-15 08:49:51 -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
Mathias Agopian
f33a6e9645 Fix a race condition in sensormanager
the per-connection state assumed the main sensorservice
lock was held during access. This is however not true while
pre-processing the events just before sending them to clients.
Therefore, there was a small window during which this state
could be modified while being used.

we now have an internal lock that protects this state.

Change-Id: I594680f20f09d6a4f1f38f093a1d3f650dcef1be
2010-11-14 20:55:25 -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
75611c8a97 Switch to use kKeyFrameRate for recordvideo utility
Change-Id: I3f6abfed9c39223fe5c1a1b9c094b7ce8a8ca67f
2010-11-14 10:57:28 -08:00
Mathias Agopian
f9ce879e5c Revert "allow all 4 orientations"
This reverts commit 1d8d0159e72556ea20aba325fb27d8470282e1ba.

Change-Id: Iffd8cbad98ff7e498032df1d226f4fbc7cde95b1
2010-11-13 22:02:13 -08:00
Brad Fitzpatrick
224ba0cd06 Clean up, de-dup, and speed up ContextImpl getSystemService()
Bug: 3191436
Change-Id: I343adc016e02d0414b2d48a14e5e62a5cccb7899
2010-11-13 16:32:37 -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
Kenny Root
300ba68469 Split UTF functions from String8/16
Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.

Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7
2010-11-12 15:53:40 -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
Adam Cohen
8baf5df0fa Adding click feedback to StackView
Change-Id: If163d144c96607c53299877e5d99747530c281fe
2010-11-12 15:12:56 -08:00
Vasu Nori
e16c43bc59 remove unnecessary code from DownloadManager
Change-Id: Ief1693785f0484c1b434fb41a68693f9aff96492
2010-11-12 15:05:15 -08:00
satok
b0b5b17442 Merge "Add a function to switch back to the last used IME" 2010-11-12 15:03:03 -08:00
Jason Sams
c930e1f736 Merge "Fix line drawing in RS example." 2010-11-12 15:02:06 -08:00
Jason Sams
7194a7bacd Merge "Document RS element and type and add validity checking to type creation." 2010-11-12 15:01:07 -08:00
satok
735cf38b8c Add a function to switch back to the last used IME
Change-Id: Iac7bcc2ee16dd04d91a3e75b160622d246788c9a
2010-11-13 08:00:25 +09:00
Jason Sams
815aaebb59 Fix line drawing in RS example.
Change-Id: I5a83ac8d943488d19d83af1bd20a15a3c02999da
2010-11-12 14:58:56 -08:00
Xavier Ducrohet
cb4e77389c Merge "Layoutlib: Fix alpha support in Canvas/Paint." 2010-11-12 14:58:55 -08:00
Xavier Ducrohet
cea3a1ccf0 Merge "Layoutlib: Fill the default prop value map for View objects." 2010-11-12 14:58:48 -08:00
Jason Sams
a1b13ed091 Document RS element and type and add validity checking to type creation.
Change-Id: Ic96c0199e27785b3eabde2c6e95ed514915328e9
2010-11-12 14:58:37 -08:00