The Android Open Source Project
267e256808
am 65369424: merge from open-source master
...
Merge commit '65369424cbfbf165b4324bdcb6f138435462a196' into kraken
* commit '65369424cbfbf165b4324bdcb6f138435462a196':
Add keycodes PageUp and PageDown
2010-04-08 11:29:23 -07:00
Scott Main
f507149a6a
am 6b04d5c7: am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo
...
Merge commit '6b04d5c735df7fa05c705f979eff8821989ab73d' into kraken
* commit '6b04d5c735df7fa05c705f979eff8821989ab73d':
docs: revisions to the installLocation documentation
2010-04-08 11:29:19 -07:00
The Android Open Source Project
529973acc2
merge from open-source master
...
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
2010-04-08 11:27:55 -07:00
Scott Main
c01e716961
am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo
...
Merge commit '4981863de52941f053bf002ae2f9c8f705534599' into froyo-plus-aosp
* commit '4981863de52941f053bf002ae2f9c8f705534599':
docs: revisions to the installLocation documentation
2010-04-08 11:25:36 -07:00
Scott Main
436aa0ff9c
Merge "docs: revisions to the installLocation documentation" into froyo
2010-04-08 11:22:42 -07:00
Jaikumar Ganesh
b64b585c79
am dd35ce8e: am 0dbec5f4: am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
2010-04-08 10:19:07 -07:00
Jaikumar Ganesh
ef6429e272
am 0dbec5f4: am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
2010-04-08 10:15:31 -07:00
Jaikumar Ganesh
b9ceaf375b
am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
...
Merge commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761' into kraken
* commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761':
Don't allow connection to profiles in TURNING_OFF state.
2010-04-08 10:12:57 -07:00
Fred Quintana
5cad556ce9
Merge "create a SyncManager WakeLock for each syncadapter accountType/authority pair so that it will be easy to tell via bugreport which sync adapter is holding the wake lock the most"
2010-04-08 10:12:43 -07:00
Jaikumar Ganesh
8d2ccb8b2d
am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
...
Merge commit 'd1a95f975b03371a937da87735359c286a6de7f3' into froyo-plus-aosp
* commit 'd1a95f975b03371a937da87735359c286a6de7f3':
Don't allow connection to profiles in TURNING_OFF state.
2010-04-08 10:08:25 -07:00
Jaikumar Ganesh
6b4e57141f
Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo
2010-04-08 10:01:50 -07:00
Dmitri Plotnikov
bc3d349290
Merge "Add the hidden ACTION_GET_MULTIPLE_PHONES and EXTRA_PHONE_URIS: a. Add the ACTION_GET_MULTIPLE_PHONES which will launch the contacts with multiple picker mode, and user can selected the multiple phones in the list of phone numbers. b. Add the EXTRA_PHONE_URIS which works with ACTION_PICK_MULTIPLE to specify the phone numbers should be selected by default when it is used as input or store the list of selected phone numbers when returnning from the activity."
2010-04-08 09:41:39 -07:00
Andrei Popescu
228ec386a1
am 4d232164: am ec472da7: am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
2010-04-08 09:20:44 -07:00
Andrei Popescu
3324567b12
am ec472da7: am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
2010-04-08 09:16:35 -07:00
Andrei Popescu
1e082df4fa
am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
...
Merge commit '1531d211249783bdfc3ded9323397f22a5f1fc34' into kraken
* commit '1531d211249783bdfc3ded9323397f22a5f1fc34':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
2010-04-08 09:12:43 -07:00
Andrei Popescu
d18e7e3d54
am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
...
Merge commit '3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp
* commit '3fe36fe589809b732db12054428166adb069f53b':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
2010-04-08 09:10:09 -07:00
Andrei Popescu
95ecb699b0
Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
2010-04-08 09:07:32 -07:00
Andreas Huber
5382fd86e8
am 604c0371: am c63c6e97: am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in
2010-04-08 08:47:37 -07:00
Andreas Huber
d6297df14f
am c63c6e97: am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range he
2010-04-08 08:43:30 -07:00
Andreas Huber
07101b8df3
am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and bett
...
Merge commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6' into kraken
* commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
2010-04-08 08:35:53 -07:00
Andreas Huber
4a42aa9d7c
am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error hand
...
Merge commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp
* commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
2010-04-08 08:31:20 -07:00
Andreas Huber
fd1a82638c
Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection." into froyo
2010-04-08 08:27:20 -07:00
Daniel Sandler
df14972da3
am aed9d41b: am 715896be: am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
2010-04-08 06:38:27 -07:00
Daniel Sandler
b78f4acf42
am 59ff911b: am 8c66936a: am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
2010-04-08 06:38:21 -07:00
Daniel Sandler
45d8e12a63
am 715896be: am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
2010-04-08 06:35:40 -07:00
Daniel Sandler
4db2474f27
am 8c66936a: am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
2010-04-08 06:35:34 -07:00
Daniel Sandler
7bcab219bb
am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
...
Merge commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f' into kraken
* commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f':
Transparent alarm icons for lockscreen.
2010-04-08 06:33:26 -07:00
Daniel Sandler
0b3fc41b3f
am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
...
Merge commit '070237771e89bbf027ed85302df7a91fae0fa5c2' into kraken
* commit '070237771e89bbf027ed85302df7a91fae0fa5c2':
Add emergency call button to PUK'd lockscreen.
2010-04-08 06:33:23 -07:00
Daniel Sandler
089057817f
am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
...
Merge commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8' into froyo-plus-aosp
* commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8':
Transparent alarm icons for lockscreen.
2010-04-08 06:10:12 -07:00
Daniel Sandler
221ff33f3a
am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
...
Merge commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp
* commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
Add emergency call button to PUK'd lockscreen.
2010-04-08 06:10:09 -07:00
Daniel Sandler
c75afb3e8a
Merge "Transparent alarm icons for lockscreen." into froyo
2010-04-08 06:07:57 -07:00
Daniel Sandler
81ce80eb67
Merge "Add emergency call button to PUK'd lockscreen." into froyo
2010-04-08 06:06:50 -07:00
Dianne Hackborn
e312f161e3
am 48357eee: am b921b37b: am a327dbdd: am ecb0e637: Fix issue #2541849 : System crash when an app with active notifications...
2010-04-07 22:48:22 -07:00
Dianne Hackborn
e14a2862ab
am b921b37b: am a327dbdd: am ecb0e637: Fix issue #2541849 : System crash when an app with active notifications...
2010-04-07 22:44:56 -07:00
Dianne Hackborn
f7dc4ca344
am a327dbdd: am ecb0e637: Fix issue #2541849 : System crash when an app with active notifications...
...
Merge commit 'a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken
* commit 'a327dbddccb002919b98bdfd7abd81619826a3b8':
Fix issue #2541849 : System crash when an app with active notifications...
2010-04-07 22:42:46 -07:00
Dianne Hackborn
356f09beba
am ecb0e637: Fix issue #2541849 : System crash when an app with active notifications...
...
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp
* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
Fix issue #2541849 : System crash when an app with active notifications...
2010-04-07 22:39:18 -07:00
Wu-cheng Li
645c78914e
am 1479d202: am 249c902c: am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review.
2010-04-07 22:10:18 -07:00
Wu-cheng Li
e607682fb7
am 249c902c: am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review.
2010-04-07 22:06:37 -07:00
Wu-cheng Li
051a9b3687
am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review.
...
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken
* commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
Update API and javadoc according to API review.
2010-04-07 22:01:54 -07:00
Wu-cheng Li
ba00ad094e
am 3f4639a6: Update API and javadoc according to API review.
...
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp
* commit '3f4639a6611222ae1ae5493de49213250d292139':
Update API and javadoc according to API review.
2010-04-07 21:58:21 -07:00
Suchi Amalapurapu
f1af75602e
am eb606ec9: am 3e543abb: am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:40:29 -07:00
Suchi Amalapurapu
c530fdf60c
am 3e543abb: am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:36:43 -07:00
Suchi Amalapurapu
7b18bae449
am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
...
Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken
* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
Fix 2579461
2010-04-07 21:32:30 -07:00
Suchi Amalapurapu
33409ed31f
am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
...
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp
* commit 'c2461be6279137f872becf695befeb7ba8770a64':
Fix 2579461
2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
de14d8f178
Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:24:36 -07:00
Dianne Hackborn
2cb3b9f368
am f0dc083d: am d49c455c: am 822a7e2d: am ce59fb8b: Fix issue #2578244 : playing audio file downloaded by the browser...
2010-04-07 19:22:29 -07:00
Dianne Hackborn
104e3100eb
am d49c455c: am 822a7e2d: am ce59fb8b: Fix issue #2578244 : playing audio file downloaded by the browser...
2010-04-07 19:17:45 -07:00
Grace Kloba
9d9e89f276
am 390aca99: am 962ebd1f: am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
2010-04-07 19:17:37 -07:00
Grace Kloba
45f1793ada
am 962ebd1f: am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
2010-04-07 19:14:53 -07:00
Dianne Hackborn
b50eb1d9db
am 822a7e2d: am ce59fb8b: Fix issue #2578244 : playing audio file downloaded by the browser...
...
Merge commit '822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken
* commit '822a7e2defcfbd006a7840e1da19cf0827d46736':
Fix issue #2578244 : playing audio file downloaded by the browser...
2010-04-07 19:13:22 -07:00