Eric Fischer
afe9461b52
Merge "Import revised translations."
2011-09-20 10:54:52 -07:00
Ben Murdoch
f9580d594a
Merge "Cleanup for bug 5278763"
2011-09-20 10:32:28 -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
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
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
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
Ben Komalo
85a61c4d6f
Merge "Only run "core" apps when encrypting device." into ics-factoryrom
2011-09-19 16:52:37 -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
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
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
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
John Reck
50f95b42cc
Merge "Disable extract mode in find on page"
2011-09-19 15:27:07 -07:00
Ben Komalo
553acf0409
Only run "core" apps when encrypting device.
...
This forces the package manager to only read packages that have
coreApp="true" in their manifest when encrypting the device, since no
non-essential processes or applications should run in that time.
Bug: 5031399
Change-Id: I87e8b27703e42553940167858db9473705d5d843
2011-09-19 15:21:33 -07:00
Michael Jurka
df9d4e88db
Merge "Speeding up Recent Apps"
2011-09-19 15:11:23 -07:00
Wink Saville
a71483c7be
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
Wink Saville
c69396973b
Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
2011-09-19 15:07:42 -07:00
Fabrice Di Meglio
6c2d9a14bf
Merge "TextLayoutCache code refactoring"
2011-09-19 15:06:34 -07:00
Wink Saville
3df8b23fd0
am f946c282: Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
...
* commit 'f946c282c2fbe851d6157ed34bbacabdff8f76ba':
Add PROPERTY_IMS_REG_REQUIRED.
2011-09-19 15:02:05 -07:00
Wink Saville
f946c282c2
Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
2011-09-19 14:59:26 -07:00
Michael Jurka
57e4d44f09
Speeding up Recent Apps
...
- removing unused calls on startup
- no longer compositing bitmaps against a background bitmap
Change-Id: If26812ef475d5d972d98dd1cb9f7f741eeb99dae
2011-09-19 14:49:59 -07:00
Mathias Agopian
0e87259233
Merge "fix EGL debugger"
2011-09-19 14:46:40 -07:00
Fabrice Di Meglio
4dd99e5912
TextLayoutCache code refactoring
...
- use vector (instead of array) for advances and glyphs
- reverse glyphs directly in computeRunValuesWithHarfbuzz() (instead of reversing them after)
Change-Id: I716a8f914fd043818d7cb80cca76ee5fb0effb96
2011-09-19 14:46:37 -07:00
Mathias Agopian
575e01c6c7
fix EGL debugger
...
always use GL_RGBA, GL_UNSIGNED_BYTE for screen capture
and make sure to handle GL_BGRA_EXT used on some gpu.
Change-Id: If9c973677fec8a5c4e72be22e7ef7d4bf5f008f4
2011-09-19 14:44:37 -07:00
Dianne Hackborn
f382e65ab4
am 2c2ab586: Fix issue #5260129 : Suggestion strip in Talk app not showing all the time
...
* commit '2c2ab5864f6037cebac5a4c73ec039f266d0dcfd':
Fix issue #5260129 : Suggestion strip in Talk app not showing all the time
2011-09-19 14:39:11 -07:00