Daniel Sandler
f37c2e0afb
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
0f337df1c0
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
06b7deb8c0
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
031689ea41
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
345a965ca5
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
d329a39092
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
eee6d2f3b1
Merge "Make sure Region handles invalid rectangles"
2011-09-20 14:02:53 -07:00
Mathias Agopian
44bfbbe501
Merge "fix the float Rect in OpenGLRenderer to handle NANs"
2011-09-20 14:02:44 -07:00
Dianne Hackborn
0799e951a6
Merge "Fix issue #5312624 : Lock screen very flickery"
2011-09-20 12:37:10 -07:00
Daniel Sandler
d1d074326d
Merge "More debug logs for RSSI updates." into ics-factoryrom
2011-09-20 11:47:50 -07:00
RoboErik
bbb11b8010
Merge "Add a warning to changing colors in the docs" into ics-factoryrom
2011-09-20 11:34:20 -07:00
Daniel Sandler
c49e195da4
More debug logs for RSSI updates.
...
Bug: 5340142
Change-Id: I1f7f106301d3942cc88d21d97a6c732c712e4516
2011-09-20 14:30:50 -04:00
Dianne Hackborn
bc1aa7bbc7
Fix issue #5312624 : Lock screen very flickery
...
The key thing was to fix isVisibleOrBehindKeyguardLw() so that it
wouldn't count a window as not visible if it was just currently
in the process of drawing due to an orientation change.
Also improve logic in deciding when to turn screen on to better ensure
the screen is in a stable state, in particular treating screen off
as a frozen screen and not allowing it to turn on until the
update of the screen due to any config change is done.
Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
2011-09-20 11:20:31 -07:00
Eric Fischer
afe9461b52
Merge "Import revised translations."
2011-09-20 10:54:52 -07:00
Michael Jurka
2d69cff88e
Merge "Fix crash in recent apps" into ics-factoryrom
2011-09-20 10:49:48 -07:00
Daniel Sandler
38cfcfbc32
Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom
2011-09-20 10:44:07 -07:00
Daniel Sandler
f1ebcee224
Fix MENU icon weirdness. (DO NOT MERGE)
...
(Broken by change I7cbb7bbf.)
Bug: 5308636
Change-Id: I30ca20f62bd140a823eb926a9a0521c4d6014680
2011-09-20 13:38:22 -04:00
Ben Murdoch
f9580d594a
Merge "Cleanup for bug 5278763"
2011-09-20 10:32:28 -07:00
Daniel Sandler
ee0835b95d
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
Eric Fischer
50c83888a6
Import revised translations.
...
Change-Id: I5e375bebc8f74d9108a929246f16608427ce9317
2011-09-20 10:21:56 -07:00
Justin Ho
c70f6af3a9
Merge "Reversal of indeterminate progressbar"
2011-09-20 09:57:48 -07:00
Chih-Chung Chang
ed4cfe70ca
Merge "Fix 5224359: Add width and height to media store."
2011-09-20 09:23:34 -07:00
Daniel Sandler
3144a6ca15
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
...
Bug: 5328284
Change-Id: Ib49af35a7919dbf1cdb99f357798101d2534e853
2011-09-20 11:12:15 -04:00
Daniel Sandler
4cea3b4bd1
Fix disappearing nav icons. (DO NOT MERGE)
...
Bug: 5328284
Change-Id: Iaa20454cff9f5a340da7b0c71190796445e8a205
2011-09-20 11:12:00 -04:00
Daniel Sandler
291c6d789d
Merge "Fix disappearing nav icons."
2011-09-20 07:47:45 -07:00
Daniel Sandler
0559e6138f
Merge "Stop clobbering the systemUiVisibility on navbar touch."
2011-09-20 07:47:40 -07:00
Daniel Sandler
f0e8daa405
Fix disappearing nav icons.
...
Bug: 5328284
Change-Id: Iaa20454cff9f5a340da7b0c71190796445e8a205
2011-09-20 10:46:26 -04:00
The Android Open Source Project
3617cb6521
Reconcile with ics-factoryrom-release
...
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
2011-09-20 07:43:10 -07:00
The Android Automerger
4dde85babe
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 06:28:15 -07:00
Chih-Chung Chang
e1bf8efaff
Fix 5224359: Add width and height to media store.
...
Change-Id: I27376285a551e648eb0ea010dfdf6b8ed873cdd8
2011-09-20 20:41:44 +08:00
JP Abgrall
20e93c0507
dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
...
Add extra network interface statistics.
Bug:5322407
Change-Id: I9441b2ca2517d8380b2c9f5bb5bd077a48438d04
Signed-off-by: JP Abgrall <jpa@google.com>
2011-09-19 22:29:26 -07:00
James Dong
e676b37c63
Add QVGA resolution to CamcorderProfile
...
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
2011-09-19 21:54:30 -07:00
Jeff Sharkey
7c349b1d97
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
88b18eb8c2
Merge "Upload correct txPackets count." into ics-factoryrom
2011-09-19 21:42:13 -07:00
Peter Ng
5d7508374c
Reversal of indeterminate progressbar
...
-it now goes the other way
Change-Id: Ib069fe2bd430237ac4c14aa7f2cf188fbb14ea36
2011-09-19 20:52:20 -07:00
James Dong
3907c79aeb
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
92d0a64b90
Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
2011-09-19 20:06:52 -07:00
James Dong
07b9ae3312
Add QVGA resolution to CamcorderProfile
...
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
2011-09-19 19:32:26 -07:00
Peter Ng
cb61187783
Merge "Keyguard padding fixes"
2011-09-19 19:01:58 -07:00
Irfan Sheriff
284ccdcdc1
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
3b6377b120
Merge "Add supplication shut down recovery" into ics-factoryrom
2011-09-19 18:58:58 -07:00
Jeff Sharkey
92cefaeb31
Upload correct txPackets count.
...
Bug: 5321340
Change-Id: Ie4dc7a91bf1cdc4d64c75ff09ae0cdd0fb141b5d
2011-09-19 18:37:11 -07:00
RoboErik
4f52061b51
Add a warning to changing colors in the docs
...
Change-Id: Ia1fdfd5e2c31c5665fb08ccc389957b6af6f3736
2011-09-19 18:06:34 -07:00
Justin Ho
f2ff20e05b
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
a181bb4b8c
Tuning Overscroller's scroll curve
...
Softer end + rounder curve with less contrast
Bug: 5200575
Change-Id: Icff6ba3cf7ae052c80b2e80e2d2b07085fcb40ce
2011-09-19 17:52:06 -07:00
Justin Ho
719797b9a6
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
54ecf3c636
Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom
2011-09-19 17:49:53 -07:00
Fred Quintana
029749e2ad
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
acfd5ebb49
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
70a85687b5
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