Chet Haase
74cf145646
am f37696b7: am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev
...
* commit 'f37696b70cb1219ce0a1a52eae597b8ddfe62a88':
Fix lockscreen wave animation artifacts
2013-10-03 16:14:23 -07:00
Chet Haase
f37696b70c
am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev
...
* commit '76a5c86df7902870c87ff07ffd0628cb10f32c00':
Fix lockscreen wave animation artifacts
2013-10-03 16:11:42 -07:00
Chet Haase
167a32326e
Fix lockscreen wave animation artifacts
...
On some display sizes, the wave animation was sometimes
running more than once, starting over in the center and animating
outward... partially.
The problem was that the calculations determining the alpha value
of the dots was returning bogus values when the display area was
large enough, which is why the bug is only on some devices.
This fix simplifies the math and ensures that the wave only animates
once, from start to finish.
Issue #11005936 regression on lockscreen animation for multi-wave widget
Change-Id: Id21a2e4d2271f01c82c4bc6e1f37d78e68b9b6e4
2013-10-03 15:50:35 -07:00
Alan Viverette
92a827b816
am a6125957: am 093318ee: Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev
...
* commit 'a612595733483213d757fd1bb9c976b06d61a38b':
Add importantForAccessibility mode to block entire hierarchy
2013-10-03 15:41:41 -07:00
Dianne Hackborn
8a5f7ab6e1
am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev
...
* commit '22c298a5df7a9fa53826ecfa4925372b1eebf8bc':
KLP/KitKat is now API 19.
2013-10-03 15:39:44 -07:00
Jonathan Dixon
34eb4f3d16
am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev
...
* commit '4730dda880097b1c25096e323be8a527fd6e0b09':
Decouple construction of WebView, CookieSyncManager, WebViewDatabase
2013-10-03 15:39:42 -07:00
Eino-Ville Talvala
61e5349dfb
am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev
...
* commit '31ea028e71af59ebf7b5fe9dd215e61b8d86d162':
Camera2: Implement idle callbacks
2013-10-03 15:39:39 -07:00
Dianne Hackborn
7c55154d47
am 80e75d39: am 0d763a90: Merge "Implement issue #11050739 : Show swapped out RAM" into klp-dev
...
* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
Implement issue #11050739 : Show swapped out RAM
2013-10-03 15:39:36 -07:00
Dianne Hackborn
61509ca5ba
am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741 : configupdater needs to be explicit when it calls startService()" into klp-dev
...
* commit '479dde0bc21a1e9d0bb8dad801cfe015f6c7e416':
Fix issue #10378741 : configupdater needs to be explicit when it calls startService()
2013-10-03 15:39:33 -07:00
Dianne Hackborn
5eaac1ce33
am e31f959c: am d143d1ff: Merge "Fix issue #11044267 : AppOpsManager.startWatchingMode should take a String" into klp-dev
...
* commit 'e31f959c68a9dfa00daa5b5580ced31badfb1127':
Fix issue #11044267 : AppOpsManager.startWatchingMode should take a String
2013-10-03 15:39:30 -07:00
Dianne Hackborn
495fe22d68
am 2d3f995a: am d585f954: Merge "Fix issue #10921903 : CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev
...
* commit '2d3f995a65f2acd60559b1db57ae3ab2346a1df0':
Fix issue #10921903 : CTS: android.os.cts.ParcelTest#testReadBundle...
2013-10-03 15:39:27 -07:00
Daniel Sandler
12aea9d797
am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev
...
* commit '97bc628fa737a87b0b855b76404fd1527eca67f8':
Goo goo ga joob.
2013-10-03 15:39:24 -07:00
Marco Nelissen
d9ff894eae
am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev
...
* commit '05f56fc121e176ef4e227639a7b636a875f38037':
Add PowerManager method to assign blame to a single uid
2013-10-03 15:39:18 -07:00
John Spurlock
bee8af8207
am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev
...
* commit 'c3752cfb6d5381795433ccdbcd8f84cada832790':
Store decor rects per window for transition cropping.
2013-10-03 15:38:52 -07:00
Christopher Tate
64884eef54
am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev
...
* commit 'b61c82190d9d16cd4a7dff8af81aff7f43c19cc4':
Fix cross-process race in initial files/cache dir creation
2013-10-03 15:38:47 -07:00
Adam Lesinski
b2db2fbce3
am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev
...
* commit '6d90862f2387d24c28e9d1c8f080cb9a4ff15011':
Private flags are masked in correct variable
2013-10-03 15:38:44 -07:00
John Reck
cd6a2d3079
am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev
...
* commit '47dc3248e09002a5a55dc427f752da8ebd623868':
Reduce max recents on lowram
2013-10-03 15:38:38 -07:00
Yuhao Zheng
d2078bc8c9
New Telephony APIs to return MMS UA and UAProfUrl
...
Added two public APIs under TelephonyManager to return MMS UserAgent and
UAProfUrl strings, for apps that handle SMS/MMS.
Bug: 11054501
Change-Id: Ifa1a64990fa2bf7d0e340d784a9672bf79525338
2013-10-03 15:06:21 -07:00
Raph Levien
63b3eb6523
Fix Text appears on top of existing text when composing in gmail.
...
Fix for bug 6473708. This patch changes from "last update wins" to
merging together the change regions, in the logic of deciding which
blocks need to be updated for painting, so that when there are multiple
changes batched for a draw, they're all taken into account.
Change-Id: I183d453c436125e5efec7031b4d61b43989653f9
2013-10-03 14:28:54 -07:00
Robert Greenwalt
3ea0c99b67
Revert "Use a build-specific wifi country code"
...
This reverts commit c33cd23c17c24df33550a6662cedfe60b323604a.
bug:11064682
Change-Id: I35825a7005e75f3abf02f23f31dee1cb7b101c31
2013-10-03 21:15:54 +00:00
Alan Viverette
a612595733
am 093318ee: Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev
...
* commit '093318eeac4fd839c722a902612c2f00e1da2f71':
Add importantForAccessibility mode to block entire hierarchy
2013-10-03 13:35:23 -07:00
Alan Viverette
093318eeac
Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev
2013-10-03 20:33:56 +00:00
Dianne Hackborn
22c298a5df
am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev
...
* commit '7192c6d7c6272c788e5e72ca416354491119fbfa':
KLP/KitKat is now API 19.
2013-10-03 12:26:31 -07:00
Jonathan Dixon
4730dda880
am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev
...
* commit '46507f4bc7ce4e77881391a1cc4ffa33fcb9ed59':
Decouple construction of WebView, CookieSyncManager, WebViewDatabase
2013-10-03 12:26:27 -07:00
Eino-Ville Talvala
31ea028e71
am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev
...
* commit 'b77b7babd5da8b0e8517bfe30aaa904313926566':
Camera2: Implement idle callbacks
2013-10-03 12:20:24 -07:00
Dianne Hackborn
80e75d3946
am 0d763a90: Merge "Implement issue #11050739 : Show swapped out RAM" into klp-dev
...
* commit '0d763a901e6f205c05fbec3123225a41672def45':
Implement issue #11050739 : Show swapped out RAM
2013-10-03 12:20:12 -07:00
Dianne Hackborn
479dde0bc2
am 6a6f96a2: Merge "Fix issue #10378741 : configupdater needs to be explicit when it calls startService()" into klp-dev
...
* commit '6a6f96a296679c23f61b58b34985c8b25960a151':
Fix issue #10378741 : configupdater needs to be explicit when it calls startService()
2013-10-03 12:20:07 -07:00
Dianne Hackborn
e31f959c68
am d143d1ff: Merge "Fix issue #11044267 : AppOpsManager.startWatchingMode should take a String" into klp-dev
...
* commit 'd143d1ffd7656d1ad3ec4fbccd26564035bca787':
Fix issue #11044267 : AppOpsManager.startWatchingMode should take a String
2013-10-03 12:20:04 -07:00
Dianne Hackborn
2d3f995a65
am d585f954: Merge "Fix issue #10921903 : CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev
...
* commit 'd585f95406f8b12e36ca436faea7113ecd8704fd':
Fix issue #10921903 : CTS: android.os.cts.ParcelTest#testReadBundle...
2013-10-03 12:19:56 -07:00
Daniel Sandler
97bc628fa7
am 0a660528: Merge "Goo goo ga joob." into klp-dev
...
* commit '0a660528374f0cf4fc24eb610ea048c99cbd27a1':
Goo goo ga joob.
2013-10-03 12:19:51 -07:00
Marco Nelissen
05f56fc121
am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev
...
* commit '95867a652410b5f0193cf301f5737381bcbd3a88':
Add PowerManager method to assign blame to a single uid
2013-10-03 12:19:42 -07:00
Dianne Hackborn
7192c6d7c6
Merge "KLP/KitKat is now API 19." into klp-dev
2013-10-03 19:19:10 +00:00
John Spurlock
c3752cfb6d
am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev
...
* commit 'e660ecc436c6bb9d3476298e97976a24b432482e':
Store decor rects per window for transition cropping.
2013-10-03 12:18:31 -07:00
Christopher Tate
b61c82190d
am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev
...
* commit 'ef4f8222fc671d2453e4bcb35978afdfa9734b78':
Fix cross-process race in initial files/cache dir creation
2013-10-03 12:18:26 -07:00
Adam Lesinski
6d90862f23
am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev
...
* commit 'd65825ab1cdbfd88122beaaad8cf815434cbf46d':
Private flags are masked in correct variable
2013-10-03 12:18:23 -07:00
John Reck
47dc3248e0
am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev
...
* commit '9a93f6f039920c2e24cdef172c9cbd39586b949c':
Reduce max recents on lowram
2013-10-03 12:18:14 -07:00
Dianne Hackborn
6bc3789b39
KLP/KitKat is now API 19.
...
Bug: 10348975
Change-Id: I19bf1a56064deda2e59085520960aac8ce3a825b
2013-10-03 12:17:31 -07:00
Jonathan Dixon
46507f4bc7
Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev
2013-10-03 18:52:56 +00:00
Eino-Ville Talvala
b77b7babd5
Merge "Camera2: Implement idle callbacks" into klp-dev
2013-10-03 18:33:54 +00:00
Dianne Hackborn
0d763a901e
Merge "Implement issue #11050739 : Show swapped out RAM" into klp-dev
2013-10-03 17:45:42 +00:00
Dianne Hackborn
6a6f96a296
Merge "Fix issue #10378741 : configupdater needs to be explicit when it calls startService()" into klp-dev
2013-10-03 17:44:38 +00:00
Dianne Hackborn
d143d1ffd7
Merge "Fix issue #11044267 : AppOpsManager.startWatchingMode should take a String" into klp-dev
2013-10-03 17:44:18 +00:00
Dianne Hackborn
fd6c7b12c3
Fix issue #10378741 : configupdater needs to be explicit when it calls startService()
...
Not enough time to fix everything, so instead we'll make it a warning
in this release and finish up turning it into a target-SDK based
exception in the next release.
Change-Id: I5aae64a1225a145f03ba4162238b53d5e401aba2
2013-10-03 10:42:26 -07:00
Dianne Hackborn
d585f95406
Merge "Fix issue #10921903 : CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev
2013-10-03 17:23:04 +00:00
Daniel Sandler
0a66052837
Merge "Goo goo ga joob." into klp-dev
2013-10-03 17:20:21 +00:00
Dianne Hackborn
4a7d824c3b
Fix issue #10921903 : CTS: android.os.cts.ParcelTest#testReadBundle...
...
...fails from KRS84 across all platforms
My fix for issue #10807048 was wrong, wrong, wrong. The problem was
actually just a stupid mistake in ArrayMap.erase(). This makes it
all right.
Change-Id: I762f7a2d5100bceb86a091ab3d6368edc21b4266
2013-10-03 10:19:20 -07:00
Jonathan Dixon
eb9e801424
Decouple construction of WebView, CookieSyncManager, WebViewDatabase
...
Bug 10932261
Most of this flow exists purely to get the Context from
CookieSyncManager.createInstance over to WebViewDatabaseClassic. Make
that depenency more explicit (with a TODO to remove it) and this allows
a much simpler CookieSyncManager implementation for the normal case.
Note after this patch, CookieSyncManager.getInstance() is technically fine
to call without a prior call to createInstance, but retaining the
ordering requirement as a convenience for anyone developing on new OS
but still supporting the older versions.
(Note that CookieSyncManager instance is not required for correct
operation of either existing webview, so these changes only impact
the public API contract of object lifetimes, not the underlying
implementation)
Change-Id: I51fdd6622704f1c749277fee6df2f84ac4c704d2
2013-10-03 17:53:33 +01:00
Marco Nelissen
95867a6524
Merge "Add PowerManager method to assign blame to a single uid" into klp-dev
2013-10-03 16:34:57 +00:00
Marco Nelissen
d983ba5cac
Add PowerManager method to assign blame to a single uid
...
Currently used by audioflinger to account for recording wakelocks.
b/10985160
Change-Id: I18fc8487f2a197bf02b5269a4bcae9e75b6c2207
2013-10-03 08:49:36 -07:00
Eino-Ville Talvala
e841d4e165
Camera2: Implement idle callbacks
...
- Rework camera callback binder interface
- Connect up idle, disconnect callbacks
- A few unit tests for shutter firing and idle use
Bug: 10549462
Change-Id: I8455a8a0561e366b7edeef6b101682be2ec44d79
2013-10-03 15:44:32 +00:00