drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,718 Commits 1 Branch 0 Tags
Commit Graph

27718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
8fbe89d2d1 Merge "Move pngs from drawable to drawable-mdpi in project frameworks/base" 2010-08-02 15:39:41 -07:00
John Wang
de9993c2ce am e0b35c6d: (-s ours) am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread 
Merge commit 'e0b35c6d44ea548b52a4e536b2dbd03c94b0afd3'

* commit 'e0b35c6d44ea548b52a4e536b2dbd03c94b0afd3':
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
 2010-08-02 15:35:56 -07:00
John Wang
e0b35c6d44 am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread 
Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp

* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
 2010-08-02 15:33:47 -07:00
John Wang
8bffa72b9c Merge changes Ic30e2801,I387bab4d into gingerbread 
* changes:
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
 2010-08-02 15:31:37 -07:00
Christopher Tate
1f4c67a4b1 am 79f2d005: am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread 
Merge commit '79f2d00596b7e24a285443c8e9e77bece3f5e9e2'

* commit '79f2d00596b7e24a285443c8e9e77bece3f5e9e2':
  Mute a common-case progress log about input injection
 2010-08-02 15:27:26 -07:00
Gilles Debunne
b0dde8e9b5 Move pngs from drawable to drawable-mdpi in project frameworks/base 
After error during file transfer...

Change-Id: I21da694f81a4290e9af1f7647a8ceb6c6d3d806b
 2010-08-02 15:21:27 -07:00
Christopher Tate
79f2d00596 am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread 
Merge commit 'a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp

* commit 'a213ce02ced6511edf02e29c45057f344bfe8636':
  Mute a common-case progress log about input injection
 2010-08-02 15:19:19 -07:00
John Wang
4de9d20260 Handle call list in CallManager "do not merge". 
Cherry-picked from master.
Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
     * 1. APIs to access list of calls
     * 2. APIs to check if any active call, which has connection other than
     * disconnected ones, pleaser refer to Call.isIdle()
     * 3. APIs to return first active call
     * 4. APIs to return the connections of first active call
     * 5. APIs to return other property of first active call

Change-Id: Ic30e28018d14e496e9427f96fec8a7c2ff7c1549
 2010-08-02 15:18:17 -07:00
Christopher Tate
a213ce02ce Merge "Mute a common-case progress log about input injection" into gingerbread 2010-08-02 15:14:44 -07:00
John Wang
ccd88b6594 Create CallManager class "do not merge" 
Cherry-pick from master.
Initial check-in to support multiple call channels.

Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759
 2010-08-02 15:13:53 -07:00
Vasu Nori
a17b5f7c81 Merge "do begin-end transaction before standalone insert/update/delete sql" 2010-08-02 14:52:23 -07:00
Xia Wang
3208c26f6d Merge "Create Mock Ril Controller as a static library, Generate a simple test case using the controller, wrap tests uing mockril in a seperate package." 2010-08-02 14:52:21 -07:00
Vasu Nori
ce38b98feb do begin-end transaction before standalone insert/update/delete sql 
also fix bug# 2871037
Change-Id: I13325f8eabff4f218d3206905010803b61d8e2cd
 2010-08-02 14:51:33 -07:00
Kenny Root
b0289f62af am 59d4a536: am 739cdab7: Merge "Do not deference before null check" into gingerbread 
Merge commit '59d4a5369cd68d4b65809ded407611b62b013f9a'

* commit '59d4a5369cd68d4b65809ded407611b62b013f9a':
  Do not deference before null check
 2010-08-02 13:31:41 -07:00
Kenny Root
59d4a5369c am 739cdab7: Merge "Do not deference before null check" into gingerbread 
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp

* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
  Do not deference before null check
 2010-08-02 13:29:01 -07:00
Kenny Root
739cdab7cb Merge "Do not deference before null check" into gingerbread 2010-08-02 12:33:40 -07:00
Xia Wang
237e594402 Create Mock Ril Controller as a static library, 
Generate a simple test case using the controller,
wrap tests uing mockril in a seperate package.

Change-Id: Iae9422ec30963aae79cc1b58e17df6cff16955c8
 2010-08-02 12:20:30 -07:00
Wink Saville
ae2036a8f9 am 7472c219: am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2'

* commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:09:03 -07:00
Nipun Kwatra
c3c9f12b08 Merge "including limits.h to fix simulator build." 2010-08-02 12:08:42 -07:00
Wink Saville
7472c219a1 am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp

* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:06:34 -07:00
Wink Saville
1540a7ea1a am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:02:42 -07:00
Christopher Tate
09e85dc027 Mute a common-case progress log about input injection 
Change-Id: I37c9f5cb239ab93fde3a42f71f2782d8734c53ce
 2010-08-02 11:59:11 -07:00
Daniel Sandler
6976e1d0d7 Merge "Actually reference the fixed Proguard flags." 2010-08-02 11:53:59 -07:00
Daniel Sandler
1ab5cae8df Actually reference the fixed Proguard flags. 
Bug: 2869888
Change-Id: I3277b51cd411c7933607c08b6022870ef83e9197
 2010-08-02 14:53:16 -04:00
Adam Powell
d3122de292 Merge "Added CHOICE_MODE_MULTIPLE_MODAL to ListView." 2010-08-02 11:32:57 -07:00
Nipun Kwatra
7d435c5e7e including limits.h to fix simulator build. 
Change-Id: I473a62ab8282e4e89e48ee6d7e99aec6ed37076a
 2010-08-02 11:30:06 -07:00
Adam Powell
8350f7dbc3 Added CHOICE_MODE_MULTIPLE_MODAL to ListView. 
Based on ActionModes, CHOICE_MODE_MULTIPLE_MODAL supports the new
Honeycomb-style selection mode.

Change-Id: I293ea22487db8e081c95e5236f1e053f7dd4ada6
 2010-08-02 11:28:31 -07:00
Wink Saville
c69f5be0ed Add PhoneSubInfo.getCompleteVoiceMailNumber. 
PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
 2010-08-02 11:07:51 -07:00
Nipun Kwatra
16f8c620ab Merge "Implementing getSupportedPictureSizes" 2010-08-02 10:12:20 -07:00
Nipun Kwatra
b1fb6079ef Implementing getSupportedPictureSizes 
Go through all the supported picture sizes and choose the smallest one with
both dimensions higher than the passed in video width and height.

Change-Id: I4e9fe7a6384a0feeb9e069239ec68c70fb5f3033
 2010-08-02 09:49:07 -07:00
Scott Main
08364d867e am 77a66069: am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd'

* commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:36:15 -07:00
Scott Main
77a66069eb am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp

* commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:29:49 -07:00
Scott Main
d3579580df am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread

* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:23:50 -07:00
Scott Main
9cd797902e Merge "Doc change: Add nexus one to dev phones." into froyo 2010-08-02 09:16:30 -07:00
Mike Lockwood
2b51f47a4c Merge changes Iccc3a445,I82ce80a4 
* changes:
  MTP: Implement GetNumObjects
  Clean up MtpDatabase API.
 2010-08-02 08:38:02 -07:00
Maksymilian Osowski
13ee57e89e Merge "Time-out mechanism and state machine." 2010-08-02 08:24:11 -07:00
Maksymilian Osowski
42bee9cf76 Time-out mechanism and state machine. 
Change-Id: I47c4342c02ea152b1503b9d5268900df3b40683c
 2010-08-02 16:22:28 +01:00
Brad Fitzpatrick
8b13ed701b am 4edd80db: am ee34a49f: Add missing word from docs. 
Merge commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c'

* commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c':
  Add missing word from docs.
 2010-08-02 08:09:07 -07:00
Brad Fitzpatrick
4edd80db95 am ee34a49f: Add missing word from docs. 
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.
 2010-08-02 08:02:05 -07:00
Brad Fitzpatrick
ee34a49ffc Add missing word from docs. 
My mistaker from an earlier commit.

Change-Id: Ic04b3c411da32f7dca03d23d39182915e3567172
 2010-08-02 07:54:18 -07:00
Kenny Root
930d3af75f Do not deference before null check 
The return of parsePackageLite wasn't checked until after it was
deferenced. Move the deference below the null check and remove redundant
set.

Bug: 2852726
Change-Id: I3eaaea5050948145eed44b64507dc846993d98eb
 2010-08-02 07:52:56 -07:00
Mike Lockwood
7a047c8986 MTP: Implement GetNumObjects 
Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-02 10:52:20 -04:00
Mike Lockwood
59c777a24a Clean up MtpDatabase API. 
Return MTP response codes instead of booleans for success or failure.
Remove some unused code.

Change-Id: I82ce80a4d7779233264e3caf139ebd0cece12f5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-02 10:37:41 -04:00
Dianne Hackborn
37b4a3c2f2 am f4e145fd: am 543f250d: Merge "Make the systemui process persistent." into gingerbread 
Merge commit 'f4e145fd123a6941348e16a595107b155bd880e8'

* commit 'f4e145fd123a6941348e16a595107b155bd880e8':
  Make the systemui process persistent.
 2010-07-31 12:19:39 -07:00
Mathias Agopian
5688ac84bd am 67e4ff76: am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec'

* commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec':
  remove copybit hack from software opengl (libagl)
 2010-07-31 12:19:26 -07:00
Dirk Dougherty
cb2d4c2771 am bd502940: am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit 'bd5029403e0f9d93086604df6dbb1b989e58e964'

* commit 'bd5029403e0f9d93086604df6dbb1b989e58e964':
  Doc change: Cleanup for licensing doc.
 2010-07-31 12:19:18 -07:00
Romain Guy
eb4e0c3c1c Merge "Refactor Skia shaders handling." 2010-07-30 19:20:09 -07:00
Romain Guy
06f96e2652 Refactor Skia shaders handling. 
With this change, Skia shaders can easily be applied to any mesh. This change also
supports ComposeShader. For instance, this can be used to blend a gradient and a
bitmap togehter and paint a string of text with the result.

Change-Id: I701c2f9cf7f89b2ff58005e8a1d0d80ccf4a4aea
 2010-07-30 19:18:16 -07:00
Dianne Hackborn
f4e145fd12 am 543f250d: Merge "Make the systemui process persistent." into gingerbread 
Merge commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp

* commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
  Make the systemui process persistent.
 2010-07-30 19:12:50 -07:00
Dianne Hackborn
543f250d9c Merge "Make the systemui process persistent." into gingerbread 2010-07-30 19:10:01 -07:00