Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,964 Commits 3 Branches 0 Tags
7339f035b97bddd90daa7fa6bd1721945df2e438
Commit Graph

10148 Commits

Author SHA1 Message Date
Dianne Hackborn
7339f035b9 am 306e2b50: am 2be9a0e7: am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:45:21 -07:00
Dianne Hackborn
2be9a0e791 am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 
Merge commit '2c5c9bb89b539a1a97d093a54669bf2242697410' into kraken

* commit '2c5c9bb89b539a1a97d093a54669bf2242697410':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
 2010-04-08 11:41:38 -07:00
Dianne Hackborn
2c5c9bb89b am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 
Merge commit '2670105ee6929d3036a1a7134400730f214f0f7e' into froyo-plus-aosp

* commit '2670105ee6929d3036a1a7134400730f214f0f7e':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
 2010-04-08 11:39:03 -07:00
The Android Open Source Project
a3f1f164c0 am 4a78a4fe: am 892debc6: am 65369424: merge from open-source master 2010-04-08 11:37:37 -07:00
Dianne Hackborn
2670105ee6 Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:35:27 -07:00
The Android Open Source Project
892debc681 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
The Android Open Source Project
65369424cb merge from open-source master 
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
 2010-04-08 11:27:55 -07:00
Jaikumar Ganesh
e6c5d1d8be 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
0dbec5f4b2 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
08695a5c91 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
9e82d359bc 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
d1a95f975b Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:01:50 -07:00
Dianne Hackborn
af4c302a0a Fix issue #2580316: Contacts and Phone app not supporting landscape mode... 
...when launched from car home launcher

For Eclair we made Droid a special case of treating the accelerometer as
a hard orientation indicator for the car dock.  This should really be the
default behavior, so make it so.

Change-Id: I70efb92036f86b55a436df29230253a192239adc
 2010-04-08 09:52:51 -07:00
Dmitri Plotnikov
4464784b63 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
55bd1f13df 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
ec472da766 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
1531d21124 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
3fe36fe589 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
Andrei Popescu
31d2aa1e17 Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). 
It is now always called via the MediaPlayer.onCompletion() callback.

Fix b: 2533272

Change-Id: If86cf6b2ab355ddcd976cd6a2ad92ce071a1af33
 2010-04-08 15:19:22 +01:00
Bai Tao
fc7838b45c 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.

Change-Id: Icacae0ab9fc0f5e90aa28796fac55528df5324d5
 2010-04-08 21:55:46 +08:00
Daniel Sandler
108aacd88f 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
9019003307 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
715896be3d 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
8c66936a8d 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
6fec76a081 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
070237771e 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
8d318958a3 Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:07:57 -07:00
Daniel Sandler
9f71025b37 Merge "Add emergency call button to PUK'd lockscreen." into froyo 2010-04-08 06:06:50 -07:00
Daisuke Miyakawa
58b50f86cd Refactor vCard parser so that its implementation detail would be hidden from users. 
Move the current implementation or 2.1 and 3.0 to VCardParserImpl_V21 and VCardParserImpl_V30.
- From the view of users, it is strange to make vCard 3.0 inherit vCard 2.1.
- Those two specifications still have similar implementation detail, so make implementation of vCard 3.0 inherits vCard 2.1 makes sense from technical view point.

Now VCardParser_V21 and VCardParser_V30 are independent class.

Remove strict mode in vCard 3.0, since strict parsing is not necessary from the view of actual use, and needs to extra effort to support it.

Bug: 2576738
Change-Id: I1d5cb6cffffb53337faa2dd7c519e7254e12da86
 2010-04-08 19:58:58 +09:00
Wu-cheng Li
e2642ea220 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
249c902ca6 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
75a9cbaea4 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
4baf4e6a74 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
3e543abbc1 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
Wu-cheng Li
3f4639a661 Update API and javadoc according to API review. 
bug:2553570
Change-Id: I0353938f513c119cec0e31eb980dc4569e17d7eb
 2010-04-08 12:31:06 +08:00
Suchi Amalapurapu
a599469f90 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
c2461be627 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
Suchi Amalapurapu
40e472521a 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.

Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
 2010-04-07 20:43:54 -07:00
Dianne Hackborn
2e13f37347 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
Grace Kloba
9b4fe0271f 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
Dianne Hackborn
d49c455cc9 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
Dianne Hackborn
b758ff4748 am 9ed9c0e4: am d93df9ca: am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 2010-04-07 19:10:13 -07:00
Dianne Hackborn
822a7e2def am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp

* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
  Fix issue #2578244: playing audio file downloaded by the browser...
 2010-04-07 19:07:54 -07:00
Grace Kloba
962ebd1fcc am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 
Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken

* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
  Revert "Use the content width to calculate the zoom overview"
 2010-04-07 19:05:32 -07:00
Dianne Hackborn
ce59fb8b68 Fix issue #2578244: playing audio file downloaded by the browser... 
...shows an image downloaded by the browser

The downloads directory needs to be non-plural for backwards compatibility.

Change-Id: Ifb6ddf8ee980a57ad113a5fc8b51f5acd8df5955
 2010-04-07 19:02:13 -07:00
Grace Kloba
520d684093 am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp

* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
  Revert "Use the content width to calculate the zoom overview"
 2010-04-07 19:00:40 -07:00
Grace Kloba
667543cdb5 Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 18:57:52 -07:00
Dianne Hackborn
d93df9cac9 am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 
Merge commit 'b37abe3867d582d68918d38f0684783f457543bb' into kraken

* commit 'b37abe3867d582d68918d38f0684783f457543bb':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
 2010-04-07 18:57:33 -07:00
Dianne Hackborn
b37abe3867 am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 
Merge commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp

* commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
 2010-04-07 18:41:42 -07:00
Grace Kloba
188bf8deb4 Revert "Use the content width to calculate the zoom overview" 
This reverts commit 4a4f9886a7.

Fix http://b/issue?id=2577238
 2010-04-07 18:37:32 -07:00