Jim Miller
eaa11a7231
Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1
2012-01-20 15:24:20 -08:00
Justin Ho
e46f869629
am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1
...
* commit 'b09f6f96e3583da320b69486869bc98fd463735e':
Update WiMAX assets to match new style Bug: 5724605
2012-01-20 14:50:30 -08:00
Justin Ho
b09f6f96e3
Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1
2012-01-20 14:48:51 -08:00
Justin Ho
f87da6e846
Update WiMAX assets to match new style
...
Bug: 5724605
Change-Id: Iab24c3e5aad3af38d5ba3a5a8f383c79270bdea3
2012-01-20 14:47:26 -08:00
Jim Miller
6d6a70a337
Fix 5797764: Increase lock screen's thread priority
...
This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.
Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
2012-01-20 14:41:55 -08:00
Daniel Sandler
aaa7b7728f
am 639ed754: Hide mobile RSSI on devices without mobile data.
...
* commit '639ed754bba866d2a47ef7ca58e56806b546b149':
Hide mobile RSSI on devices without mobile data.
2012-01-20 14:40:26 -08:00
Daniel Sandler
639ed754bb
Hide mobile RSSI on devices without mobile data.
...
Also fixes some minor layout glitches along that row of
icons (Bluetooth vertical alignment & spacing, battery text
width, inter-icon padding).
Bug: 5895226
Change-Id: I303c2899bf21ddb7e28914d8fb36efd7090ac5e2
2012-01-20 14:37:54 -08:00
Justin Ho
ffb0c0b3ca
am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1
...
* commit '70e21c927afeff05d8f26e9df2f36785ca19fdfd':
New out-of-service RSSI.
2012-01-20 14:35:09 -08:00
Justin Ho
70e21c927a
Merge "New out-of-service RSSI." into ics-mr1
2012-01-20 14:33:07 -08:00
Daniel Sandler
e3b86f2137
New out-of-service RSSI.
...
This creates (well, restores, since we had this until
Honeycomb) a user-visible state for "no service" that is
distinguishable from "very very weak service" (less than one
bar).
Bug: 5775939
Change-Id: Idd08b1a9411d5d94e4d7a97fa7f3ffd92b8113a6
2012-01-20 14:06:40 -08:00
Dianne Hackborn
892d11f492
am 1bae8066: Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1
...
* commit '1bae80668cc1d12bb4a4b93bce1960b2601de131':
Fix issue #5823276 again: home repaints after full-screen app is exited
2012-01-20 12:03:47 -08:00
Dianne Hackborn
1bae80668c
Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1
2012-01-20 12:01:51 -08:00
Daniel Sandler
a64f899fa6
am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
...
* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
Always show appropriate mobile service label.
2012-01-20 11:31:10 -08:00
Daniel Sandler
4d3161f379
Merge "Always show appropriate mobile service label." into ics-mr1
2012-01-20 11:28:44 -08:00
Jeff Brown
1bc82792b8
am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
...
* commit 'ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28':
Implement a max time bound for rotation. (DO NOT MERGE)
2012-01-20 11:26:46 -08:00
Jeff Brown
06a0fb953f
am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
...
* commit '5d58eb06bcc8671bae72fb2389a9929e106131cc':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
2012-01-20 11:26:43 -08:00
Jeff Brown
ad1f4a2ca8
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
2012-01-20 11:24:13 -08:00
Jeff Brown
5d58eb06bc
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
2012-01-20 11:24:01 -08:00
Dianne Hackborn
cfbf7dedad
Fix issue #5823276 again: home repaints after full-screen app is exited
...
Don't consider a window as a candidate for the top fullscreen window
if it is not going to be a candiate for layout.
This fix does not include the change to ignore app tokens that are
hidden. This causes problems in some dialogs that stay hidden until
their app is ready to display, but need to perform a series of relayouts
during that time to get to the right size. Dropping this part of
the change still (mostly?) seems to allow us to avoid the bad states.
Change-Id: Ic052cb1499d3287f47e9ffeac5cd2470ee5a308c
2012-01-20 11:01:01 -08:00
The Android Open Source Project
288cde7f0a
Reconcile with ics-mr1-release
...
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
2012-01-20 10:25:28 -08:00
Jean-Baptiste Queru
ee567e08d9
am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
...
* commit 'c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
Rename LOG_ASSERT to ALOG_ASSERT
2012-01-19 17:28:34 -08:00
Jean-Baptiste Queru
45470559cd
am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
...
* commit '12b7da69957ef894ce5134989e38479c64308ea1':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
2012-01-19 17:28:30 -08:00
Jean-Baptiste Queru
db2b39300a
am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
...
* commit 'f3f650db96d40014a0203393c585c368b0dd7a9a':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
2012-01-19 17:28:26 -08:00
Jean-Baptiste Queru
dde686e2bd
am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
...
* commit '08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
2012-01-19 17:28:22 -08:00
Jean-Baptiste Queru
a1e8739757
am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
...
* commit '7ae84204c14b4abff70fcc19c3c33de2591df34b':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
2012-01-19 17:28:18 -08:00
Jean-Baptiste Queru
c3c36b4fe5
am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
...
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
2012-01-19 17:26:16 -08:00
Jean-Baptiste Queru
12b7da6995
am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
...
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
f3f650db96
am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
...
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
08d3c6e5ba
am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
...
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
2012-01-19 17:26:03 -08:00
Jean-Baptiste Queru
7ae84204c1
am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
...
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
2012-01-19 17:25:58 -08:00
Kazuhiro Ondo
32f4700172
Always show appropriate mobile service label.
...
Fix for Carrier Verification case failure for not showing
"no internet connection" text on expanded status bar while
mobile data connection is not CONNECTED state.
Bug:5884774
Change-Id: I433d5de626b9b0cff20d192cb6aae214f3e014b3
2012-01-19 20:25:26 -05:00
Jean-Baptiste Queru
d6b5584b67
am 97aa8ee8: Merge ee4618bc
...
* commit '97aa8ee81198234aedffceaf71ad216b96323393':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
2012-01-19 17:20:58 -08:00
Jean-Baptiste Queru
97aa8ee811
Merge ee4618bc
...
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
2012-01-19 17:18:25 -08:00
Jean-Baptiste Queru
fd266b3682
am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
...
* commit '36b48c30adf7236b00eccf87f3b5691359526540':
Rename (IF_)LOG() to (IF_)ALOG()
2012-01-19 17:02:27 -08:00
Jean-Baptiste Queru
36b48c30ad
am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
...
* commit 'c318bbb05e02a0080e129623ec8029d31be0d60e':
Rename (IF_)LOG() to (IF_)ALOG()
2012-01-19 16:59:41 -08:00
The Android Automerger
a5530a828a
merge in ics-mr1-release history after reset to ics-mr1
2012-01-19 16:28:56 -08:00
Justin Ho
abc90a7b48
am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276 : home repaints after full-screen app is exited"" into ics-mr1
...
* commit '820b45c0a21980a43532b9fb9823f8aa08c64a15':
DO NOT MERGE Revert "Fix issue #5823276 : home repaints after full-screen app is exited"
2012-01-19 15:44:53 -08:00
Justin Ho
820b45c0a2
Merge "DO NOT MERGE Revert "Fix issue #5823276 : home repaints after full-screen app is exited"" into ics-mr1
2012-01-19 15:43:19 -08:00
Justin Ho
170997a519
DO NOT MERGE Revert "Fix issue #5823276 : home repaints after full-screen app is exited"
...
This reverts commit 01b02a734d2988c22b00f5df6346ad03d8bf52b6.
Change-Id: I848c01fc44eb9a51ead1116b2647ed838ec1825f
2012-01-19 15:41:33 -08:00
Jean-Baptiste Queru
9d25b82d28
Merge "Rename LOG_ASSERT to ALOG_ASSERT"
2012-01-19 14:47:35 -08:00
Jean-Baptiste Queru
6df477be18
Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
2012-01-19 14:47:22 -08:00
Jean-Baptiste Queru
a826f9e2c4
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
2012-01-19 14:47:09 -08:00
Jean-Baptiste Queru
4f367f3387
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
2012-01-19 14:46:54 -08:00
Jean-Baptiste Queru
ba7f0d2a03
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
2012-01-19 14:46:40 -08:00
Jean-Baptiste Queru
ee4618bc4d
Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)"
2012-01-19 14:46:24 -08:00
Steve Block
f68633da3c
Rename LOG_ASSERT to ALOG_ASSERT
...
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
2012-01-19 14:45:08 -08:00
Steve Block
c6aacce371
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
...
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
2012-01-19 14:45:03 -08:00
Steve Block
a51f0e707f
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
...
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
2012-01-19 14:44:59 -08:00
Steve Block
933e856150
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
...
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
2012-01-19 14:44:56 -08:00
Steve Block
1afd5bab4e
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
...
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
2012-01-19 14:44:50 -08:00