Mathias Agopian
e44d21a247
fix [3018216] UI shrinks / stretches while using apps with IME
...
Change-Id: Ie4c5d8a434b4489355ed8c52af96eb931b4d7167
2010-09-21 10:52:42 -07:00
Joe Onorato
91f13923ee
Merge "Put the more notifications button on the left where it belongs."
2010-09-20 13:37:25 -07:00
Joe Onorato
605990b0a8
Merge "Tapping outside the status bar panels closes them."
2010-09-20 13:25:07 -07:00
Amith Yamasani
58cc97dab3
Merge "Fix attribute parsing of PreferenceHeader_id"
2010-09-20 11:26:02 -07:00
Joe Onorato
f4af62f675
Merge "Tablet ticker."
2010-09-20 11:18:48 -07:00
Dmitri Plotnikov
c692e2e1c9
Merge "Format the phone number with the number country's convention."
2010-09-20 10:43:34 -07:00
Kristian Monsen
5c52c02b3e
Merge "HTTP auth for Chromium HTTP stack (Java side)"
2010-09-20 05:52:53 -07:00
Hung-ying Tyan
fc09e8095b
am 852e5354: am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
...
Merge commit '852e5354f60a0131692c46f509c2e9901b0b6810'
* commit '852e5354f60a0131692c46f509c2e9901b0b6810':
SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:58:08 -07:00
Hung-ying Tyan
63c117f5be
am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
...
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp
* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:51:07 -07:00
Hung-ying Tyan
4fa4af9da8
am 97bc368b: am b17eae9e: SipService: move event handling out of system server\'s main thread
...
Merge commit '97bc368bc445c0015de6dd6557feff0dd5527d9d'
* commit '97bc368bc445c0015de6dd6557feff0dd5527d9d':
SipService: move event handling out of system server's main thread
2010-09-19 19:17:18 -07:00
Hung-ying Tyan
64ec5c1f2a
am b17eae9e: SipService: move event handling out of system server\'s main thread
...
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp
* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
SipService: move event handling out of system server's main thread
2010-09-19 19:14:30 -07:00
Hung-ying Tyan
48191ffc34
am 37d1b249: am 97963794: SIP: convert enum to static final int.
...
Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'
* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
SIP: convert enum to static final int.
2010-09-19 18:59:43 -07:00
Hung-ying Tyan
f5b3d27bd7
am 97963794: SIP: convert enum to static final int.
...
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp
* commit '97963794af1e18674dd111e3ad344d90b16c922c':
SIP: convert enum to static final int.
2010-09-19 18:56:27 -07:00
Hung-ying Tyan
2ee0d03919
resolved conflicts for merge of cf1620d6 to master
...
Change-Id: I7a1436ec4c6a96801c096f61e9dc3571c1927cae
2010-09-20 09:31:12 +08:00
Hung-ying Tyan
2ddd3e119d
am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
...
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp
* commit '5b930c49b12bdb1461a18491db768c642c38d498':
SIP: add config flag for wifi-only configuration.
2010-09-19 18:11:44 -07:00
Hung-ying Tyan
ad50813521
Merge "SIP: add config flag for wifi-only configuration." into gingerbread
2010-09-19 18:02:13 -07:00
Mike Lockwood
5505ce1601
am b5994789: (-s ours) am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
...
Merge commit 'b5994789af9c676f8e067a4a8706d2177b7cc142'
* commit 'b5994789af9c676f8e067a4a8706d2177b7cc142':
DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
2010-09-19 11:15:08 -07:00
Mike Lockwood
376cdd6d59
am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
...
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp
* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
2010-09-19 11:10:57 -07:00
Adam Powell
bcf581a8d6
am 99f0f367: am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
...
Merge commit '99f0f3676f50640dbb22bd12960f771fc414862e'
* commit '99f0f3676f50640dbb22bd12960f771fc414862e':
Fix some drawing artifacts/bugs around overlays/text anchors
2010-09-18 00:16:35 -07:00
Jeff Brown
62927a5539
am a8d95248: am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread
...
Merge commit 'a8d95248bdbb8ea0933ecf86d2859964324978a7'
* commit 'a8d95248bdbb8ea0933ecf86d2859964324978a7':
Reduce lock thrashing in native Looper.
2010-09-18 00:16:29 -07:00
Adam Powell
2c45985c23
am 4a4a53ae: am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
...
Merge commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4'
* commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4':
Fix silly touch bug in TextView. Oops.
2010-09-17 23:26:05 -07:00
Marco Nelissen
c15bdbfbde
am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
...
Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c'
* commit '5c9f35799422d818f34f814c76c2acd8c939a40c':
Add a check to track a problem the monkey script has been triggering.
2010-09-17 23:25:37 -07:00
Dianne Hackborn
7f58011bf3
resolved conflicts for merge of 1f377298 to master
...
Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
2010-09-17 23:12:26 -07:00
Adam Powell
cc89e1208f
am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
...
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp
* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
Fix some drawing artifacts/bugs around overlays/text anchors
2010-09-17 19:30:03 -07:00
Jeff Brown
7fa048f295
am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread
...
Merge commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b' into gingerbread-plus-aosp
* commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b':
Reduce lock thrashing in native Looper.
2010-09-17 19:29:50 -07:00
Adam Powell
1f6bf40676
Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
2010-09-17 19:15:38 -07:00
John Wang
517c9808c9
am afb777cb: am 0741a5ed: Merge "Add debug function." into gingerbread
...
Merge commit 'afb777cbd459f45eb833e12fbab03aed93f90409'
* commit 'afb777cbd459f45eb833e12fbab03aed93f90409':
Add debug function.
2010-09-17 18:13:50 -07:00
Adam Powell
4367ed71c8
Merge "resolved conflicts for merge of b39470b5 to master"
2010-09-17 18:00:23 -07:00
Adam Powell
8a0c4e70d8
resolved conflicts for merge of b39470b5 to master
...
Change-Id: If441c8684c576b6cbc485a37088d6869ad3fb23f
2010-09-17 17:59:06 -07:00
Jeff Brown
1396874273
Merge "Reduce lock thrashing in native Looper." into gingerbread
2010-09-17 17:26:02 -07:00
Jeff Brown
ed242de3f5
Reduce lock thrashing in native Looper.
...
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups. There is no point grabbing the
semaphore then.
Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
2010-09-17 17:01:23 -07:00
Gil Dobjanschi
95e017aa1f
Merge "I splitted the start and end transtions into separate classes."
2010-09-17 16:43:25 -07:00
Robert Greenwalt
fa62580f78
Merge "Enhance http proxy support"
2010-09-17 16:22:34 -07:00
Jeff Brown
067ed1db03
am bc9599d4: am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
...
Merge commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca'
* commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca':
Looper: Drop default parameters in favor of a safer overload.
2010-09-17 16:10:01 -07:00
Chet Haase
79bc8e6be2
am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread
...
Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686'
* commit '6dcffb434fff42b956b604e24a5b5728e721b686':
new assets
2010-09-17 15:55:11 -07:00
Romain Guy
e8ea8ccdb4
Merge "Fix positioning of 1 pixel wide lines (esp. non AA lines.)"
2010-09-17 15:49:56 -07:00
Romain Guy
22f486c32f
Merge changes Id5200e94,I08fcbfa7
...
* changes:
Add support for non AA lines.
Correctly free memory.
2010-09-17 15:49:30 -07:00
Andreas Huber
09dee9deab
am 7bc600cb: am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
...
Merge commit '7bc600cb08394e60eef984843976d4f79e5d94e8'
* commit '7bc600cb08394e60eef984843976d4f79e5d94e8':
Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 15:46:15 -07:00
Adam Powell
a6e7b5f538
am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
...
Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp
* commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266':
Fix silly touch bug in TextView. Oops.
2010-09-17 15:46:07 -07:00
Marco Nelissen
b89a986dd9
am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
...
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp
* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
Add a check to track a problem the monkey script has been triggering.
2010-09-17 15:42:21 -07:00
Adam Powell
8d978cdd29
Merge "Fix silly touch bug in TextView. Oops." into gingerbread
2010-09-17 15:41:11 -07:00
Marco Nelissen
448aadc2c7
Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
2010-09-17 15:39:00 -07:00
Andreas Huber
6774974aa6
resolved conflicts for merge of 1fc97385 to master
...
Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
2010-09-17 15:35:59 -07:00
Dianne Hackborn
e5e647f98e
am 58e0eefe: Improve power tracking of WIFI use.
...
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp
* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
Improve power tracking of WIFI use.
2010-09-17 15:20:10 -07:00
John Wang
9ce04dbeb2
am 0741a5ed: Merge "Add debug function." into gingerbread
...
Merge commit '0741a5ed38757ef2f6b52945ad494d965b3b83de' into gingerbread-plus-aosp
* commit '0741a5ed38757ef2f6b52945ad494d965b3b83de':
Add debug function.
2010-09-17 15:06:44 -07:00
John Wang
116d91b4aa
Merge "Add debug function." into gingerbread
2010-09-17 15:03:01 -07:00
Adam Powell
b68a497479
am b08013c3: Added overlay support for drawing/responding to text anchors.
...
Merge commit 'b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp
* commit 'b08013c312e3d849029a2f4c11889274c00f438d':
Added overlay support for drawing/responding to text anchors.
2010-09-17 14:53:43 -07:00
Jamie Gennis
9c2de1a4b5
Merge "Fix a SurfaceFlinger bug."
2010-09-17 14:07:13 -07:00
Stephen Hines
6eef9d9de4
Merge "Handle RS reflection name changes."
2010-09-17 13:55:39 -07:00
Nipun Kwatra
6a71ce9c9b
Merge "Adding default profiles for specific levels."
2010-09-17 13:54:55 -07:00