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

18696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
cde4f4b49c am 368d796e: Fix build. 
Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp

* commit '368d796e2e28ecd738362c7a4566cb3eb219ab26':
  Fix build.
 2010-09-27 21:09:56 -07:00
Jeff Brown
1f1889e8af am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread 
Merge commit '9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp

* commit '9c37447e5c3555e4063777e4ef82e355e57f4c68':
  Fix pointer index when splitting secondary pointers.
 2010-09-27 21:00:44 -07:00
Jeff Brown
ced8172ac1 Merge "Fix pointer index when splitting secondary pointers." into gingerbread 2010-09-27 20:57:02 -07:00
Jeff Brown
ffb16d601b Fix pointer index when splitting secondary pointers. 
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
 2010-09-27 20:54:28 -07:00
Hung-ying Tyan
1f9798de77 am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread 
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
  Don't enter DISCONNECTING state when the call/connection is not alive
 2010-09-27 19:26:11 -07:00
Hung-ying Tyan
813ccddc02 Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread 2010-09-27 19:23:35 -07:00
repo sync . build/envsetup.sh lunch passion-en
0bf2a8bd67 am 4fc3d2f0: DO NOT MERGE 
Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp

* commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a':
  DO NOT MERGE
 2010-09-27 17:51:45 -07:00
Hung-ying Tyan
915db0da45 am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread 
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp

* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
  Move SipService out of SystemServer to phone process.
 2010-09-27 16:29:33 -07:00
Hung-ying Tyan
6e0e4c4f11 Merge "Move SipService out of SystemServer to phone process." into gingerbread 2010-09-27 16:25:49 -07:00
Gilles Debunne
46fc90c680 am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp

* commit '8d7057df401af668335c38273bc62872e4dbf538':
  Updated assets in status bar. DO NOT MERGE.
 2010-09-27 16:17:28 -07:00
Gilles Debunne
eec02f9bad Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Nick Kralevich
1fcf429f15 am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp

* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
  squeeze a few more bits of randomness into /dev/random
 2010-09-27 15:26:51 -07:00
Nick Kralevich
fe5e2b58c3 Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 2010-09-27 15:23:45 -07:00
Winson Chung
5772eb1d25 am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp

* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
 2010-09-27 15:08:57 -07:00
Eric Fischer
96d205574b am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp

* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 15:04:35 -07:00
Eric Fischer
5e9c93e6e4 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Gilles Debunne
10082c6cad am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp

* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
  Revert previous status bar assets. DO NOT MERGE.
 2010-09-27 14:32:06 -07:00
Gilles Debunne
4b21b13986 Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 2010-09-27 14:26:56 -07:00
Chris Palmer
f842cbb8e8 am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. 
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp

* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
  DO NOT MERGE Clarify the explanation of Android's security design.
 2010-09-27 14:18:15 -07:00
Wu-cheng Li
d9806b8fd8 am 83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread 
Merge commit '83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp

* commit '83ea6389097570e8526a0b612051bb591186f165':
  The old overlay should be destroyed if orientation changes.
 2010-09-27 14:12:49 -07:00
Wu-cheng Li
674166e6fc Merge "The old overlay should be destroyed if orientation changes." into gingerbread 2010-09-27 14:09:02 -07:00
Kenny Root
288f3c9bdb am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread 
Merge commit '04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp

* commit '04a426f5b50a628fb73bc29b003b0e5bece17c27':
  Use buffered I/O during certificate parsing
 2010-09-27 12:48:05 -07:00
Kenny Root
6569e8fb44 Merge "Use buffered I/O during certificate parsing" into gingerbread 2010-09-27 12:45:44 -07:00
Dianne Hackborn
4308e64d25 am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp

* commit 'd8691d73d158acd9ffc63748126e822afd656707':
  Allow all apps to call ContentResolver.getType().
 2010-09-27 12:45:31 -07:00
Dianne Hackborn
7a0090f88a Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 2010-09-27 12:42:34 -07:00
Jeff Brown
601908229f am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread 
Merge commit '14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp

* commit '14a288da6a372230d9af41da12241fe500eec837':
  Add suuport for splitting touch events across windows.
 2010-09-27 12:37:03 -07:00
Jeff Brown
6949f5da66 Merge "Add suuport for splitting touch events across windows." into gingerbread 2010-09-27 12:33:14 -07:00
Joe Onorato
e80632f321 am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp

* commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29':
  We only need at most one tty icon.
 2010-09-27 11:56:29 -07:00
Joe Onorato
225045812a am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread 
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp

* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
  If an icon add remove get coalesced, don't remove some other icon.
 2010-09-27 11:56:24 -07:00
Hung-ying Tyan
fd4c746749 am fccd5bc7: Fix build. 
Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp

* commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f':
  Fix build.
 2010-09-27 11:52:35 -07:00
Joe Onorato
257fe6b330 Merge "We only need at most one tty icon." into gingerbread 2010-09-27 11:41:24 -07:00
Joe Onorato
567e7e0a69 Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread 2010-09-27 11:40:15 -07:00
Hung-ying Tyan
7a429e2b4e am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread 
Merge commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp

* commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8':
  SipAudioCall: remove SipManager dependency.
 2010-09-27 11:20:35 -07:00
Hung-ying Tyan
ba54c76ede am 025a39af: SIP: misc fixes 
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
 2010-09-27 11:20:30 -07:00
Hung-ying Tyan
1ed549bd24 am 00a22064: SipService: handle cross-domain authentication error 
Merge commit '00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp

* commit '00a22064efef4f574e439079aae2deae1a087a31':
  SipService: handle cross-domain authentication error
 2010-09-27 11:20:24 -07:00
Hung-ying Tyan
5aac807823 Merge "SipAudioCall: remove SipManager dependency." into gingerbread 2010-09-27 10:54:27 -07:00
Dan Morrill
1f710db85d am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d 
Merge commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp

* commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b':
  Adding a feature to indicate that the device possesses low-latency audio.
 2010-09-27 10:39:19 -07:00
Dan Morrill
9420e797f9 Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread 2010-09-27 10:30:41 -07:00
James Dong
de62df216c am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 
Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp

* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
  Fix track duration calculation if the start timestamp is non-zero
 2010-09-27 10:13:04 -07:00
James Dong
ac06987ae2 Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 2010-09-27 10:08:52 -07:00
Andreas Huber
b27a0b2755 am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread 
Merge commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp

* commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
  Support other kinds of HTTP redirect in NuHTTPDataSource
 2010-09-27 09:24:18 -07:00
Andreas Huber
c32b23674a Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread 2010-09-27 09:20:58 -07:00
Chung-yih Wang
afc0169dd7 am bd229420: Fix the unhold issue especially if one is behind NAT. 
Merge commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp

* commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627':
  Fix the unhold issue especially if one is behind NAT.
 2010-09-27 09:03:01 -07:00
Eric Laurent
4ad2e655e7 am 9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread 
Merge commit '9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp

* commit '9627847d588cd969f60dcc79d165209184a90069':
  Fix error in AudioEffect command status reporting.
 2010-09-27 08:45:07 -07:00
Eric Laurent
61d5a7f8e4 Merge "Fix error in AudioEffect command status reporting." into gingerbread 2010-09-27 08:41:00 -07:00
Kenny Root
1ed42d265a am 465618ed: Merge "Use buffered output during packages.xml write" into gingerbread 
Merge commit '465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp

* commit '465618ed567c418442890fcf91b6ee361b22b88b':
  Use buffered output during packages.xml write
 2010-09-27 08:15:57 -07:00
Kenny Root
ca5eb60743 Merge "Use buffered output during packages.xml write" into gingerbread 2010-09-27 08:03:47 -07:00
Fabrice Di Meglio
ee239b4042 am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread 
Merge commit '28fa220c8da1ea2933ac96595516d1efa545c1ea' into gingerbread-plus-aosp

* commit '28fa220c8da1ea2933ac96595516d1efa545c1ea':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
 2010-09-27 02:27:08 -07:00
Fabrice Di Meglio
1b0fe7a6dc Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread 2010-09-27 02:16:01 -07:00
Jeff Brown
d1b0a2bfe5 Add suuport for splitting touch events across windows. 
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time.  Could be used for
other things later.

Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.

Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
 2010-09-26 22:20:12 -07:00