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
Matthew Xie
dcbc97fc28
Check null of pidPair to skip the case the service record has been removed
...
Check null of pidPair instead of pidPair.first which caused a nullpointer
exception. clean local variables after sending out STATE_OFF intent.
Check bluetooth state in removeServiceRecord.
bug 5330367
Change-Id: Ib0af8143223bea48d3f587cca18544c4aef29980
2011-09-19 22:45:00 -07: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
Justin Ho
a0570496b4
am f2ff20e0: Merge "Tuning Overscroller\'s scroll curve Softer end + rounder curve with less contrast Bug: 5200575"
...
* commit 'f2ff20e05baec2d9849c7456e8455a2671820f2a':
Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575
2011-09-19 18:07:29 -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
323594ea98
am 719797b9: am 54ecf3c6: Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom
...
* commit '719797b9a61c4c31afcf71ebbfef797adab4be43':
Updated Status bar icons Bug: 5297795
2011-09-19 17:53:12 -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
9c50bbcf34
am 029749e2: am acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
...
* commit '029749e2ad4f9554f009ab36ddd91a388a5f8b80':
An extra is being written as one type and read as the wrong type.
2011-09-19 17:35:31 -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
Justin Ho
b4ac65594b
Updated lockscreen camera assets
...
Bug: 5296921
Change-Id: Ibe5eec4668b1859fe8f645b68c25ff7a52ceae50
2011-09-19 17:02:09 -07:00
Ben Komalo
9ec548072d
am 70a85687: am 85a61c4d: Merge "Only run "core" apps when encrypting device." into ics-factoryrom
...
* commit '70a85687b5fae5a28bc786aa5729e87202447fa3':
Only run "core" apps when encrypting device.
2011-09-19 16:58:43 -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
Ben Komalo
85a61c4d6f
Merge "Only run "core" apps when encrypting device." into ics-factoryrom
2011-09-19 16:52:37 -07:00
Chet Haase
a95e1087b2
Fix 5335993, calculate correct size of lockscreen buttons
...
The buttons on the lockscreen were sized at startup time,
before the actual size of the keyboard's container (KeyboardView)
was known. Also, horizontal/vertical gaps were not taken into
account in calculating perecent sizes of the keys. This change
causes resize events (including the first one where the container
size is finally known) to recalculate the keys' sizes and positions
according to correct sizing of the container and the keyboard's gaps.
Change-Id: I5ba7a401226ed4b100e5739f3405388955d97997
2011-09-19 16:52:13 -07:00
Mathias Agopian
8bba5efcee
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
83b186a246
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
Wink Saville
a48b9fa5aa
Add PROPERTY_IMS_REG_REQUIRED.
...
Bug: 5337311
Change-Id: Ic5f310f485b49b29385bc1427a1f156484896569
2011-09-19 16:38:52 -07:00
Irfan Sheriff
cf54e4aafc
Add supplication shut down recovery
...
When framework fails to get a notice of supplicant shut down,
timeout and proceed with a forced terminate
Also, avoid killing supplicant immediate upon stop and use the
timeout for recovery
Bug: 5337272
Change-Id: Id8971c673dc3082a5f15a6d5cef907bebe1e0fa0
2011-09-19 16:30:51 -07:00
Joe Onorato
f125de2999
Merge "Support custom flattenable types for RPC." into ics-aah
2011-09-19 16:29:53 -07:00
Joe Onorato
606640d90a
Merge "Generate fallthrough for unhandled actions in RPC methods." into ics-aah
2011-09-19 16:29:44 -07:00
Jeff Brown
b1784a7b35
am 4b5441a7: Merge "TextLayoutCacheKey needs to store start and count."
...
* commit '4b5441a7201a2f28becf3ab7fb33694f137e1998':
TextLayoutCacheKey needs to store start and count.
2011-09-19 16:27:58 -07:00
Fred Quintana
a77253a417
An extra is being written as one type and read as the wrong type.
...
Bug: 5342556
Change-Id: I664bd84546cb8da2936c5afe65381336a97ef5cd
2011-09-19 16:26:37 -07:00
Jeff Brown
4b5441a720
Merge "TextLayoutCacheKey needs to store start and count."
2011-09-19 16:25:51 -07:00
Joe Onorato
0ca2a36d8d
Support custom flattenable types for RPC.
2011-09-19 16:23:18 -07:00
Jeff Brown
7aac297960
TextLayoutCacheKey needs to store start and count.
...
Bad merge.
Change-Id: Id6507b3a7e35808a6d34501a45d79fcb7470657d
2011-09-19 16:19:13 -07:00
Jean-Michel Trivi
d087beb08b
am dede7074: am 6c038506: Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
...
* commit 'dede70744ab53c81cd650a60c687150146d0ba6b':
Fix bug 5300223 Lockscreen should recycle bitmaps
2011-09-19 15:41:09 -07:00
Jean-Michel Trivi
dede70744a
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
6c03850616
Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
2011-09-19 15:37:23 -07:00
Joe Onorato
4742c0cd30
Generate fallthrough for unhandled actions in RPC methods.
...
Change-Id: I2913b20577dd47e000aa6b7403352ee492e6191a
2011-09-19 15:35:02 -07:00