74830 Commits

Author SHA1 Message Date
Adam Powell
0283a5573c Fix crash setting null seekbar thumb
External bug http://code.google.com/p/android/issues/detail?id=15693

Change-Id: I2f869b4ebd1f0857564c69999abb49285beefd14
2012-04-19 09:58:22 -07:00
Irfan Sheriff
26c246a3f1 Merge "fix build - new current.txt" 2012-04-17 12:52:20 -07:00
Matthew Xie
b85a769e0b Merge "Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn." 2012-04-17 12:48:00 -07:00
Jean-Baptiste Queru
453d98fc70 fix build - new current.txt
Change-Id: Ia114d5f3fef2b84272237eded88c7908f65851f6
2012-04-17 12:46:15 -07:00
Chris Craik
3844067c3c am a6d62b76: am 4f998a1e: am fd862e98: Add header for forward compatibility
* commit 'a6d62b76ad8f09bd677fa115fbb71fdae2510552':
  Add header for forward compatibility
2012-04-17 12:08:25 -07:00
Andreas Huber
87459dbc59 Merge "MediaCrypto's constructor can throw RuntimeException." 2012-04-17 12:05:22 -07:00
Chris Craik
a6d62b76ad am 4f998a1e: am fd862e98: Add header for forward compatibility
* commit '4f998a1e4865f11f772bbe18a702f4ad95ab353e':
  Add header for forward compatibility
2012-04-17 12:05:12 -07:00
Chris Craik
4f998a1e48 am fd862e98: Add header for forward compatibility
* commit 'fd862e9828d544f593a622f2914d1257366ae802':
  Add header for forward compatibility
2012-04-17 12:02:47 -07:00
Amith Yamasani
d95ce04bdc Merge "Make sure persistent processes are not replicated for secondary users." 2012-04-17 11:55:54 -07:00
Jeff Brown
0192e966ff Merge "Add persistence for selected keyboard layout." 2012-04-17 11:52:29 -07:00
Pannag Sanketi
1645ee2473 Merge "Making the setSurface non-static" 2012-04-17 11:42:48 -07:00
Jeff Brown
c37ef79d39 Merge "Move legacy sensor support to a new class." 2012-04-17 11:42:39 -07:00
Jeff Brown
a3bc565882 Add persistence for selected keyboard layout.
Bug: 6110399
Change-Id: I99544bf05e9755385bee478b5f047ccec2e5cae3
2012-04-17 11:42:25 -07:00
Amith Yamasani
a4a54e2a5f Make sure persistent processes are not replicated for secondary users.
An intent is launched in a singleton process if the process is persistent
and the resolved activity/service/etc is not requested to run in a different
process.

Change-Id: I1463e73a76bc8bde4185f9cf4395edb47515841d
2012-04-17 11:41:30 -07:00
Irfan Sheriff
1205054240 Merge "Open p2p pre-association service discovery API" 2012-04-17 11:40:03 -07:00
Matthew Xie
43b6fd9a54 Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn.
When we fail to get the property, print out warning message, turn
Discoverable off.
Bug 6302990

Change-Id: Ie21aa2a89050c74d99d9ee521a95ffa822114757
2012-04-17 11:39:25 -07:00
Irfan Sheriff
2e3dec5aeb Merge "Open network service discovery API" 2012-04-17 11:39:08 -07:00
Andreas Huber
2952c5d03c MediaCrypto's constructor can throw RuntimeException.
Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5
related-to-bug: 6275919
2012-04-17 11:24:11 -07:00
Dianne Hackborn
70eafab905 Merge "Change dock animations to not use alpha, to make Mathias happy." 2012-04-17 11:15:27 -07:00
Chris Craik
fd862e9828 Add header for forward compatibility
Change-Id: I6e3da852d50fc14cfb6fb50f7dd867f37daea19d
2012-04-17 10:56:17 -07:00
Irfan Sheriff
24734bddd8 Merge "Fix SSID parse" 2012-04-17 10:52:41 -07:00
John Reck
48ca060e65 Merge "Minor cleanup" 2012-04-17 10:37:41 -07:00
Alex Sakhartchouk
91b7be1867 Merge "Fixing test affected by API renaming." 2012-04-17 10:34:41 -07:00
Irfan Sheriff
60c8c1570b Fix SSID parse
Bug: 6350079
Change-Id: I104dafa982bd1f144ea3a4fe19a0a23d6bf8075d
2012-04-17 10:33:12 -07:00
Chris Craik
cae2db38f5 Merge "Add webview tracing bit" 2012-04-17 10:04:44 -07:00
Fred Chung
d5155299b0 am 535b0f10: am 57e351f5: am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '535b0f10aaffc0195da16531fc33644760dbcf1d':
2012-04-17 09:56:55 -07:00
Fred Chung
21f6c5b84a am 5a1cf366: am fe71253b: am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '5a1cf3661c9b47ca682511f248987e680768e530':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:54:27 -07:00
Fred Chung
535b0f10aa am 57e351f5: am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '57e351f57cc296ed3ef29bdf071713689fc4516e':
2012-04-17 09:52:44 -07:00
Fred Chung
5a1cf3661c am fe71253b: am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit 'fe71253b334e105a9f67dcef6f8790c246725976':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:51:55 -07:00
Fred Chung
57e351f57c am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '3d467946b2950c6a5e4946c49a33cf4c8d68df20':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:48:44 -07:00
Fred Chung
fe71253b33 am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '3d467946b2950c6a5e4946c49a33cf4c8d68df20':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:48:01 -07:00
Fred Chung
3d467946b2 Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1 2012-04-17 09:46:11 -07:00
Chris Wren
3a59d6e26d A layout that switches between its children based on the requested layout height.
Change-Id: I5a4e5892fbed7cab2470e458a38accbbcb05ae51
2012-04-17 09:06:21 -07:00
Daisuke Miyakawa
8334679be1 Merge "Introduce cachedPhotoIcon for notification's large icon" 2012-04-17 08:52:46 -07:00
Steve Block
cf6960ed15 Merge "Clean up JavaDoc for WebView.getZoomControls()" 2012-04-17 05:08:04 -07:00
Steve Block
06d268e3ad Clean up JavaDoc for WebView.getZoomControls()
Bug: 5461416
Change-Id: I4f2b5c9e4b4c2b1a38d678cb6756f128670ee490
2012-04-17 12:19:10 +01:00
Fred Chung
9340e2122e Updated "Making your App Location Aware" class to include information on location provider enable check.
Change-Id: Ie6e966b4204eed60f518759480cebc945f87d91f
2012-04-16 23:28:45 -07:00
satok
fbf7e1f343 Merge "Get rid of "isSentenceLevelSpellCheckSupported"" 2012-04-16 22:07:45 -07:00
Dianne Hackborn
8eedb8bf60 Change dock animations to not use alpha, to make Mathias happy.
Also tweak the action bar animations to slide up/down like the
dock animations.

Change-Id: Id3c85ba76100639a6f6c77b7fd2a060c9d26f38c
2012-04-16 19:31:58 -07:00
Svetoslav Ganov
55a28720fe Merge "Fixing a regression I have introduced." 2012-04-16 19:30:45 -07:00
Svetoslav Ganov
31725b3f38 Fixing a regression I have introduced.
bug:6344558

Change-Id: Ie726e091942e337962baa052953002be724068b1
2012-04-16 19:29:43 -07:00
Irfan Sheriff
14c92b8f84 Merge "Fix ssid fetch" 2012-04-16 19:25:03 -07:00
Irfan Sheriff
e1531a65a9 Merge "Log messages in dump" 2012-04-16 19:24:55 -07:00
Svetoslav Ganov
21d1251637 Merge "Fixing broken add focusables behavior I have introduced." 2012-04-16 19:15:27 -07:00
Svetoslav Ganov
3cb889caa3 Fixing broken add focusables behavior I have introduced.
bug:6344608

Change-Id: I1d241c02bc22c5ef3f4b4b69a756772e8b2ef902
2012-04-16 19:14:41 -07:00
Brett Chabot
21610283e8 Merge "Build junit API docs from external/junit." 2012-04-16 18:35:43 -07:00
Brett Chabot
571db3203c Build junit API docs from external/junit.
Bug 5826326

Change-Id: I67d18cacf0c4e908ec41dbed483314ece8b72ceb
2012-04-16 18:23:19 -07:00
Dianne Hackborn
ac4243f177 Make ACTION_SEND and ACTION_SEND_MULTIPLE build full clip items.
The current code was just for transferring URI grants.  This change
makes it so it propagates all of the relevant extra data into the
ClipData, so developers can just retrieve the ClipData for all of
their data needs.

Change-Id: I36a050c7beae325aceb84518337f878c337d8b86
2012-04-16 18:10:37 -07:00
John Reck
533e69f0be Minor cleanup
Change-Id: Ide35e6cf2abe2b723e6d45e796a21ae135706bf5
2012-04-16 18:08:00 -07:00
Dianne Hackborn
ac76e72272 Merge "Add new scale-up window manager animation." 2012-04-16 17:34:25 -07:00