John Huang
7374d229a3
am edc8029b: Merge "Retain signal level even when data is offline." into ics-factoryrom
...
* commit 'edc8029b8b9ac9233e4dc73f05415265bac712de':
Retain signal level even when data is offline.
2011-09-20 14:36:08 -07:00
John Huang
13f6b902e7
Merge "Retain signal level even when data is offline." into ics-factoryrom
2011-09-20 14:34:07 -07:00
Matthew Xie
e24b316c31
am 778eccf4: Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom
...
* commit '778eccf4923571c77f158e92b2f5f0f7dfd21875':
Check null of pidPair to skip the case the service record has been removed
2011-09-20 14:14:29 -07:00
Justin Ho
89312d7d39
am aff24a52: Merge "Updated lockscreen camera assets Bug: 5296921" into ics-factoryrom
...
* commit 'aff24a52d20a26a8cd374ea6dd284eee16e4ffc0':
Updated lockscreen camera assets Bug: 5296921
2011-09-20 14:14:16 -07:00
Daniel Sandler
f9d70c28e6
am d1d07432: Merge "More debug logs for RSSI updates." into ics-factoryrom
...
* commit 'd1d074326d81b6a92cff5a5fc279b8c9177cc7aa':
More debug logs for RSSI updates.
2011-09-20 14:14:15 -07:00
RoboErik
8c4d16ec6b
am bbb11b80: Merge "Add a warning to changing colors in the docs" into ics-factoryrom
...
* commit 'bbb11b80106c8687f2833c3d4b538029fc0805e6':
Add a warning to changing colors in the docs
2011-09-20 14:14:11 -07:00
Michael Jurka
a576c0c7c6
am 2d69cff8: Merge "Fix crash in recent apps" into ics-factoryrom
...
* commit '2d69cff88e262569ac1284e2048f2a6c3aca6639':
Fix crash in recent apps
2011-09-20 14:13:53 -07:00
Daniel Sandler
5a18ef1352
am 38cfcfbc: (-s ours) Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom
...
* commit '38cfcfbc327c7d9fb65ac6dcb1074927e445ce29':
Fix MENU icon weirdness. (DO NOT MERGE)
2011-09-20 14:13:51 -07:00
Daniel Sandler
f2aef6f83f
am ee0835b9: (-s ours) Merge changes Ib49af35a,Iaa20454c into ics-factoryrom
...
* commit 'ee0835b95de225fdc34d45b777b4595d01727a40':
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
Fix disappearing nav icons. (DO NOT MERGE)
2011-09-20 14:13:48 -07:00
JP Abgrall
14aa36d209
am 20e93c05: dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
...
* commit '20e93c0507b66e697d23c58c138484d652a1b810':
dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
2011-09-20 14:13:36 -07:00
Mathias Agopian
5745a92c33
Merge "Make sure Region handles invalid rectangles"
2011-09-20 14:02:53 -07:00
Mathias Agopian
9f30332325
Merge "fix the float Rect in OpenGLRenderer to handle NANs"
2011-09-20 14:02:44 -07:00
Matthew Xie
f97c073fbc
Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom
2011-09-20 13:55:48 -07:00
Dianne Hackborn
ca1b51e6ad
Merge "Fix issue #5312624 : Lock screen very flickery"
2011-09-20 12:37:10 -07:00
Justin Ho
80e31fe5c9
Merge "Updated lockscreen camera assets Bug: 5296921" into ics-factoryrom
2011-09-20 12:09:13 -07:00
Daniel Sandler
ff61cc2469
Merge "More debug logs for RSSI updates." into ics-factoryrom
2011-09-20 11:47:50 -07:00
RoboErik
b61a6b5db8
Merge "Add a warning to changing colors in the docs" into ics-factoryrom
2011-09-20 11:34:20 -07:00
Eric Fischer
b8469d1de7
Merge "Import revised translations."
2011-09-20 10:54:52 -07:00
Michael Jurka
765c925130
Merge "Fix crash in recent apps" into ics-factoryrom
2011-09-20 10:49:48 -07:00
Daniel Sandler
689ce3638d
Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom
2011-09-20 10:44:07 -07:00
Ben Murdoch
d3c6207372
Merge "Cleanup for bug 5278763"
2011-09-20 10:32:28 -07:00
Daniel Sandler
15d259fb02
Merge changes Ib49af35a,Iaa20454c into ics-factoryrom
...
* changes:
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
Fix disappearing nav icons. (DO NOT MERGE)
2011-09-20 10:25:11 -07:00
Justin Ho
59968ec09b
Merge "Reversal of indeterminate progressbar"
2011-09-20 09:57:48 -07:00
Chih-Chung Chang
2c685cfd2f
Merge "Fix 5224359: Add width and height to media store."
2011-09-20 09:23:34 -07:00
Daniel Sandler
8ecad74cfa
Merge "Fix disappearing nav icons."
2011-09-20 07:47:45 -07:00
Daniel Sandler
433cef7ed2
Merge "Stop clobbering the systemUiVisibility on navbar touch."
2011-09-20 07:47:40 -07:00
The Android Open Source Project
35cfc07d4a
Reconcile with ics-factoryrom-release
...
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
2011-09-20 07:43:10 -07:00
The Android Automerger
52040fe26c
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 06:28:15 -07:00
Jeff Sharkey
5b59681814
am 88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom
...
* commit '88b18eb8c2034e9de35482cc737ef8d608d55867':
Upload correct txPackets count.
2011-09-19 21:44:00 -07:00
Jeff Sharkey
f430f33281
Merge "Upload correct txPackets count." into ics-factoryrom
2011-09-19 21:42:13 -07:00
James Dong
ca550f8b2c
am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
...
* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
2011-09-19 20:09:00 -07:00
James Dong
8e97a40c42
Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
2011-09-19 20:06:52 -07:00
Peter Ng
26f58b5f99
Merge "Keyguard padding fixes"
2011-09-19 19:01:58 -07:00
Irfan Sheriff
0e783d2cb5
am 3b6377b1: Merge "Add supplication shut down recovery" into ics-factoryrom
...
* commit '3b6377b120bb507f93a8f1e7e25bc026de764dd6':
Add supplication shut down recovery
2011-09-19 19:01:17 -07:00
Irfan Sheriff
66e5adf085
Merge "Add supplication shut down recovery" into ics-factoryrom
2011-09-19 18:58:58 -07:00
Justin Ho
560d03170c
Merge "Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575"
2011-09-19 18:06:13 -07:00
Justin Ho
995a1cbc21
am 54ecf3c6: Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom
...
* commit '54ecf3c636dda257cbfd22b3bc86afff8c910372':
Updated Status bar icons Bug: 5297795
2011-09-19 17:51:38 -07:00
Justin Ho
1c89770d60
Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom
2011-09-19 17:49:53 -07:00
Fred Quintana
c7407d1bea
am acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
...
* commit 'acfd5ebb49bde9f64c604dfca5cbed8cafa64594':
An extra is being written as one type and read as the wrong type.
2011-09-19 17:33:20 -07:00
Fred Quintana
2c6b415153
Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
2011-09-19 17:30:44 -07:00
Ben Komalo
e3e08993ce
am 85a61c4d: Merge "Only run "core" apps when encrypting device." into ics-factoryrom
...
* commit '85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f':
Only run "core" apps when encrypting device.
2011-09-19 16:55:54 -07:00
Ben Komalo
fa7031b513
Merge "Only run "core" apps when encrypting device." into ics-factoryrom
2011-09-19 16:52:37 -07:00
Mathias Agopian
0450452e8c
Make sure Region handles invalid rectangles
...
the boolean operation code assumes rects are valid and
could go into an infinite loop if not. make sure we
abort before that happens.
Bug: 5331198, 5334829
Change-Id: Iee4e3b838ecf504ef21f7447fd2e34a56e7dc3f8
2011-09-19 16:50:17 -07:00
Mathias Agopian
000e95e7eb
fix the float Rect in OpenGLRenderer to handle NANs
...
- we want functions like isEmpty() to return true if NANs are
involved in the Rect
- also clean-up the intersect familly of calls
- minor cleanup in the int32_t Rect as well
These played a role in http://b/5331198 .
Bug: 5331198
Change-Id: I5369725ab482e4b83da9f1bd4cee5256e5de75b2
2011-09-19 16:50:07 -07:00
Jeff Brown
5560d9119c
Merge "TextLayoutCacheKey needs to store start and count."
2011-09-19 16:25:51 -07:00
Jean-Michel Trivi
2ed083a795
am 6c038506: Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
...
* commit '6c03850616a6e87de3e1943e47605cc5ebb20e2b':
Fix bug 5300223 Lockscreen should recycle bitmaps
2011-09-19 15:39:31 -07:00
Jean-Michel Trivi
5bb7046892
Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
2011-09-19 15:37:23 -07:00
John Reck
c8915f5dae
Merge "Disable extract mode in find on page"
2011-09-19 15:27:07 -07:00
Michael Jurka
110586465a
Merge "Speeding up Recent Apps"
2011-09-19 15:11:23 -07:00
Wink Saville
e73b4f1fd6
am c6939697: Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
...
* commit 'c69396973b8a496e298a7076842b0e34d193651e':
Remove isAnyActiveDataConnection and promote isDisconnected.
2011-09-19 15:09:42 -07:00