ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
18,142 Commits 2 Branches 0 Tags 54 MiB
3af74f9874
Commit Graph

18142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
b03f95294f am 1f689f7e: Merge "When notifications are updated, don\'t re-show the ticker unless the text has changed." into gingerbread 
Merge commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d' into gingerbread-plus-aosp

* commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d':
  When notifications are updated, don't re-show the ticker unless the text has changed.
 2010-09-07 11:18:46 -07:00
Brad Fitzpatrick
6c59532b39 am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
 2010-09-07 11:15:01 -07:00
Joe Onorato
5ad6c91cef Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread 2010-09-07 11:14:56 -07:00
Brad Fitzpatrick
df9177bc18 Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 2010-09-07 11:12:51 -07:00
Eric Fischer
ff154165d7 am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp

* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
  Preserve old translations for changed strings.  DO NOT MERGE
 2010-09-07 11:08:19 -07:00
Eric Fischer
5987f041e5 Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:03:26 -07:00
Kenny Root
391e3cefd1 am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity
 2010-09-07 10:49:22 -07:00
Kenny Root
a25be22632 Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 2010-09-07 10:46:14 -07:00
Hung-ying Tyan
6ea9a4dad6 am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread 
Merge commit '960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp

* commit '960b31e3b3b40f92665be4b7a79da7f05ea19751':
  SipService: unset session listener if listener is gone.
 2010-09-06 20:16:51 -07:00
Hung-ying Tyan
60382f0550 Merge "SipService: unset session listener if listener is gone." into gingerbread 2010-09-06 20:13:32 -07:00
Brad Fitzpatrick
1f92dbb424 am 612ff274: Quell annoying Java ascii/unicode warning. 
Merge commit '612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp

* commit '612ff27425cf2976396d992f32b58ab900c7d708':
  Quell annoying Java ascii/unicode warning.
 2010-09-06 19:34:43 -07:00
Chung-yih Wang
58291ad459 am b6264a87: Fix the build. 
Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp

* commit 'b6264a8795ed9469c80727123e3cafda1b07eda3':
  Fix the build.
 2010-09-05 22:01:38 -07:00
Chung-yih Wang
52bd4403ea am b12baad9: Add equals() funcation for SipPhone. 
Merge commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp

* commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407':
  Add equals() funcation for SipPhone.
 2010-09-05 21:12:57 -07:00
Kenny Root
dde5a45571 am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread 
Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp

* commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
  Reduce footprint of Signature from ~7000 to ~1448
 2010-09-03 17:07:15 -07:00
Kenny Root
3c662bdb06 Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread 2010-09-03 16:59:42 -07:00
Jesse Wilson
c66554f729 am 3326f804: Fix the last remaining gaps in our Java 6 API. 
Merge commit '3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp

* commit '3326f8043858152ea2a407a9a4c20fdcdc859e73':
  Fix the last remaining gaps in our Java 6 API.
 2010-09-03 16:42:51 -07:00
Eric Laurent
4c4984185b am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread 
Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp

* commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b':
  LVM release 1.08 delivery.
 2010-09-03 16:39:59 -07:00
Eric Laurent
498805a4ec Merge "LVM release 1.08 delivery." into gingerbread 2010-09-03 16:35:54 -07:00
Adam Powell
fe9fb17cbc am 7627c221: DO NOT MERGE Tweak overscroll 
Merge commit '7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp

* commit '7627c221c6ce8bf433bf207b002eabe7236c4757':
  DO NOT MERGE Tweak overscroll
 2010-09-03 16:33:37 -07:00
James Dong
3ee1530e41 am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread 
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp

* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
  Not all audio source has the drift time information
 2010-09-03 15:45:01 -07:00
James Dong
2e536e822b Merge "Not all audio source has the drift time information" into gingerbread 2010-09-03 15:42:09 -07:00
Dianne Hackborn
e17367ca4c am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready. 
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp

* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
  DO NOT MERGE.  Some stuff that is Not Ready.
 2010-09-03 15:23:46 -07:00
Dianne Hackborn
574c1367ec am df3a0f50: Merge "Improve doc." into gingerbread 
Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp

* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
  Improve doc.
 2010-09-03 15:18:39 -07:00
Dianne Hackborn
38e036340e Merge "Improve doc." into gingerbread 2010-09-03 15:15:50 -07:00
Dianne Hackborn
6277a2c262 am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread 
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp

* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
  Adding a feature denoting support for 5 or more fully
 2010-09-03 15:10:24 -07:00
Dianne Hackborn
09a6cc531f Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread 2010-09-03 15:07:17 -07:00
Andreas Huber
c0d0ac2b0d am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting. 
Merge commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp

* commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
  Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
 2010-09-03 14:50:18 -07:00
John Wang
cb04570a96 am dc243482: Merge "Add API to get all foreground calls." into gingerbread 
Merge commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp

* commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
  Add API to get all foreground calls.
 2010-09-03 14:08:32 -07:00
John Wang
13fbcd286d Merge "Add API to get all foreground calls." into gingerbread 2010-09-03 14:06:20 -07:00
Adam Powell
0cd97934e0 am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 
Merge commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp

* commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f':
  Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
 2010-09-03 14:00:41 -07:00
Adam Powell
1ec6b4c64c Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 2010-09-03 13:58:37 -07:00
Andreas Huber
5974c5739c am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread 
Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp

* commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
  Properly buffer a certain amount of data on streaming sources before finishing prepare().
 2010-09-03 13:48:43 -07:00
Andreas Huber
ce072e2e22 Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread 2010-09-03 13:46:02 -07:00
Dianne Hackborn
b8ce6dd07c am e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp

* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
  These are not ready to be exposed.  Also rename them to be better.
 2010-09-03 13:26:30 -07:00
Dianne Hackborn
5f6716c9d9 Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 2010-09-03 13:24:33 -07:00
Scott Main
add8dbe424 am 2b136832: am c4367e54: fix code snippet error 
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error
 2010-09-03 13:18:28 -07:00
Scott Main
80d32d71b4 am c4367e54: fix code snippet error 
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread

* commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
  fix code snippet error
 2010-09-03 13:15:11 -07:00
Brad Fitzpatrick
79c2bf1542 am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp

* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
  More SharedPreferences commit() -> apply() changes.
 2010-09-03 12:49:44 -07:00
Brad Fitzpatrick
962f3a99d0 Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 2010-09-03 12:46:25 -07:00
Marco Nelissen
d9d339aaa0 am d85621c9: Don\'t crash when extra logging is enabled. 
Merge commit 'd85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp

* commit 'd85621c938286a568b1173e7ab29f80ab93d27e1':
  Don't crash when extra logging is enabled.
 2010-09-03 11:51:28 -07:00
James Dong
9609a82a45 am 7755cdd6: Remove unused/debugging code from MP4 file writer 
Merge commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp

* commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
  Remove unused/debugging code from MP4 file writer
 2010-09-03 11:33:47 -07:00
James Dong
f25738dd5b am 46e63b34: Merge "Better file size estimate" into gingerbread 
Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp

* commit '46e63b346770efa14451b8e67b7f7636c4e5a76c':
  Better file size estimate
 2010-09-03 09:55:38 -07:00
Kenny Root
9adc5e02be am 305bcbf0: Decrease PackageManagerService wait time for vold 
Merge commit '305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp

* commit '305bcbf0c961840c4505770d084a1caacc074dbb':
  Decrease PackageManagerService wait time for vold
 2010-09-03 09:55:33 -07:00
James Dong
bfa80e1fed Merge "Better file size estimate" into gingerbread 2010-09-03 09:53:13 -07:00
Kenny Root
0ecc9b564a am 12da9d74: Fix buffer compacting in NativeDaemonConnector 
Merge commit '12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp

* commit '12da9d7472ae87b841575d5358e19f143d12f900':
  Fix buffer compacting in NativeDaemonConnector
 2010-09-02 22:29:05 -07:00
Hung-ying Tyan
ab04015825 am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread 
Merge commit 'b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp

* commit 'b355714a2995ebe343808e06f69da5067f52a833':
  SipManager: always return true for SIP API and VOIP support query.
 2010-09-02 19:26:56 -07:00
Hung-ying Tyan
7657059cd1 Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread 2010-09-02 19:23:31 -07:00
Scott Main
9079ca90a4 am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp

* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
  clarify dp dimension description
 2010-09-02 18:44:11 -07:00
James Dong
0a19218186 am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread 
Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp

* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
  Calculate audio media drift time from AudioSource
 2010-09-02 18:41:49 -07:00
Scott Main
bcd7841079 am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread

* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
  clarify dp dimension description
 2010-09-02 18:30:16 -07:00