William Luh
635011173e
Revert "Expose new API for querying whether a certificate was user added."
...
This reverts commit 60b96502b39d221afb43ff7e8a49a19a2fb3c2e0.
Change-Id: Ie1c2ee4c983c4d6b0c086f252a191b3c60e50b9c
2013-11-19 01:20:45 +00:00
Craig Mautner
4c5eb224de
Notify apps when insets change.
...
Activities that handle their own configuration get layout when hidden
and the configuration changes but not when the content insets change
if they are hidden. They need to get a fresh layout for both
situations.
Fixes bug 11544694.
Change-Id: Iff3a9adb72ea7dfc3e5cd38e1b9cd7cf2006f8f5
2013-11-18 16:49:42 -08:00
Deepanshu Gupta
e6a408ed31
am bdfa8a1a: (-s ours) am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
...
* commit 'bdfa8a1ae0a4d10abd14cffb93f629803e469464':
Update ICU_Delegate methods. DO NOT MERGE
2013-11-18 16:29:24 -08:00
Deepanshu Gupta
bdfa8a1ae0
am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
...
* commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07':
Update ICU_Delegate methods. DO NOT MERGE
2013-11-18 16:25:04 -08:00
Deepanshu Gupta
5a0fd1fd0f
am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
...
* commit '9d5a9434d3fe65d32aae0a400502dde8357f0ec7':
Update ICU_Delegate methods. DO NOT MERGE
2013-11-18 16:22:41 -08:00
Deepanshu Gupta
9d5a9434d3
Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
2013-11-19 00:19:01 +00:00
William Luh
1680392e1e
Merge "Expose new API for querying whether a certificate was user added."
2013-11-19 00:14:20 +00:00
Christopher Tate
8f98252afe
Harden against transiently unavailable backup transports
...
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.
Bug 11716868
Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
2013-11-18 16:12:38 -08:00
Dirk Dougherty
856f474132
am 49b1dc33: am 63bb9185: am abb4d2da: Doc change: edit line length above button.
...
* commit '49b1dc335dee85eb72892f722164feaabe910bd0':
Doc change: edit line length above button.
2013-11-18 15:57:59 -08:00
Dirk Dougherty
49b1dc335d
am 63bb9185: am abb4d2da: Doc change: edit line length above button.
...
* commit '63bb9185d4bd4bce3361135e4fcfdba5a6157340':
Doc change: edit line length above button.
2013-11-18 15:54:01 -08:00
Dirk Dougherty
63bb9185d4
am abb4d2da: Doc change: edit line length above button.
...
* commit 'abb4d2da4374eb5e5e7a750e4b60a9145b1b1058':
Doc change: edit line length above button.
2013-11-18 23:49:48 +00:00
Dirk Dougherty
abb4d2da43
Doc change: edit line length above button.
...
Change-Id: I7fd5c192b93846e91e0069c287776996c3f01ab8
2013-11-18 15:45:30 -08:00
Chris Craik
ec0cdd1e2a
Merge "Clean up modelView matrix logic"
2013-11-18 22:50:03 +00:00
Adam Lesinski
7ae9ea572d
am bac61807: am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
...
* commit 'bac61807d3bcfff957b358cb9ad77850bd373689':
Do not hold direct ref BatteryStatsImpl$Uid$Proc
2013-11-18 13:36:06 -08:00
Adam Lesinski
bac61807d3
am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
...
* commit '1abead425c0e862e316e17521833a33d22e7a850':
Do not hold direct ref BatteryStatsImpl$Uid$Proc
2013-11-18 13:32:42 -08:00
Adam Lesinski
1abead425c
am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
...
* commit '245408d29018fee4b1231e52f5da1edcc3283c4a':
Do not hold direct ref BatteryStatsImpl$Uid$Proc
2013-11-18 13:29:25 -08:00
Adam Lesinski
245408d290
Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev
2013-11-18 21:26:32 +00:00
John Spurlock
9f99332299
am 32962b3e: am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
...
* commit '32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485':
Use scaled display size in wallpaper constraint.
2013-11-18 13:00:21 -08:00
John Spurlock
180979f76b
Fix logic problems in AnimationDrawable and View.
...
1. View now checks both queues when unscheduling runnables,
fixing the case where work was scheduled pre-attach, and unscheduled
post-attach.
2. AnimationDrawable avoids posting duplicate runnables when rescheduling
itself.
3. Decouple is-animation-running state from current frame pointer in
AnimationDrawable. Some calls init to the first frame, but do not
kick off the animation.
4. Remove workaround in SystemUI's AnimatedImageView (status bar icon)
now that the underlying framework issues are fixed.
Bug:11694594
Change-Id: I77ca6bd80262f7edcf980b2d7efc2592f8051f29
2013-11-18 15:59:37 -05:00
John Spurlock
32962b3e2c
am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
...
* commit 'c65dfef3f5ee07883446be0e6907f15fe457da9d':
Use scaled display size in wallpaper constraint.
2013-11-18 12:56:25 -08:00
John Spurlock
c65dfef3f5
am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
...
* commit 'afc76f28b93f931069bb58c4f9b524d5a99b1604':
Use scaled display size in wallpaper constraint.
2013-11-18 12:52:58 -08:00
Chris Craik
4063a0e03b
Clean up modelView matrix logic
...
bug:11359533
Also changes shader matrix to correctly account for modelView and
currentTransform()
Change-Id: I6ce18857dc6d08ea08ca7535385c2ad351ec3caa
2013-11-18 12:51:08 -08:00
John Spurlock
afc76f28b9
Merge "Use scaled display size in wallpaper constraint." into klp-dev
2013-11-18 20:49:16 +00:00
Adam Lesinski
2cd3fb5aa7
Do not hold direct ref BatteryStatsImpl$Uid$Proc
...
BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.
bug:11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209
2013-11-18 12:29:34 -08:00
Raph Levien
aff6ea9516
Merge "Initial integration of Minikin to framework"
2013-11-18 19:38:18 +00:00
John Spurlock
d6e836c4a0
Use scaled display size in wallpaper constraint.
...
Bug:11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449
2013-11-18 14:14:49 -05:00
Baligh Uddin
f60b86ecd2
am 1dc93acf: (-s ours) am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e':
Import translations. DO NOT MERGE
2013-11-18 11:00:37 -08:00
Baligh Uddin
684d488ab4
am 0076f4ac: (-s ours) am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0076f4ac0f35814fed1613cae1120b3d954fe985':
Import translations. DO NOT MERGE
2013-11-18 11:00:34 -08:00
Baligh Uddin
1dc93acf3a
am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '4dee4e1cb394b077174ee29656bde962502555de':
Import translations. DO NOT MERGE
2013-11-18 10:56:21 -08:00
Baligh Uddin
0076f4ac0f
am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5':
Import translations. DO NOT MERGE
2013-11-18 10:56:17 -08:00
Baligh Uddin
4dee4e1cb3
am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '35fb6cdf14549dac07585ae791b27e2c069bf176':
Import translations. DO NOT MERGE
2013-11-18 10:53:25 -08:00
Baligh Uddin
2cf27e7111
am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'd7b4052049cba6c793367f6b5a8c3837f06faf1e':
Import translations. DO NOT MERGE
2013-11-18 10:53:21 -08:00
Baligh Uddin
fc1cd07da1
Merge "Import translations. DO NOT MERGE"
2013-11-18 18:51:51 +00:00
Baligh Uddin
35fb6cdf14
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-18 18:51:24 +00:00
Baligh Uddin
40449901c7
Merge "Import translations. DO NOT MERGE"
2013-11-18 18:51:20 +00:00
Baligh Uddin
d7b4052049
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-18 18:51:01 +00:00
Baligh Uddin
2f538df392
Merge "Import translations. DO NOT MERGE"
2013-11-18 18:50:30 +00:00
Robert Greenwalt
66c8513423
am 51213d94: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
...
* commit '51213d943b3931434cbd196a8a159ee325a4e3fc':
Fix NPE in ConnectivityService
2013-11-18 10:37:51 -08:00
Robert Greenwalt
51213d943b
am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
...
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
Fix NPE in ConnectivityService
2013-11-18 10:33:46 -08:00
Raph Levien
a033630e80
Initial integration of Minikin to framework
...
With this patch, framework does at least some of its text rendering
using Minikin instead of TextLayoutCache. There's a lot of stuff broken
and not yet implemented, but the phone will boot.
Changes are hidden behind USE_MINIKIN, which should be set in
BoardConfig.mk for the brave. Without that, there are changes to
signatures in JNI methods and so on, but shouldn't be any visible
changes.
This commit also introduces a new abstraction for Typeface:
The new TypefaceImpl abstraction represents the functionality that
corresponds to a Java Typeface object. Currently it is backed by
SkTypeface, but in the migration to Minikin it is a FontCollection
combined with a FontStyle. This patch introduces a USE_MINIKIN
preprocessor switch, so there is no substantial change to existing
Skia-based code, but which lets us start replacing the implementation
with the Minikin version.
Change-Id: I532c4c2d32d4f4c1f349dc1db37caa112af587ea
2013-11-18 10:32:20 -08:00
Robert Greenwalt
a8a448da25
am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
...
* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
Fix NPE in ConnectivityService
2013-11-18 10:29:51 -08:00
Robert Greenwalt
e568672c9e
Merge "Fix NPE in ConnectivityService" into klp-dev
2013-11-18 18:27:23 +00:00
Deepanshu Gupta
0baec410c2
Update ICU_Delegate methods. DO NOT MERGE
...
Bug: 11435966
Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
2013-11-18 10:20:37 -08:00
Deepanshu Gupta
c94ef4716a
am 5b950250: (-s ours) am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
...
* commit '5b95025059f0925ad8d11bf503eb2acb4cc63228':
Add libphonenumber to layoutlib.jar. DO NOT MERGE
2013-11-18 10:19:42 -08:00
Deepanshu Gupta
c518249a0c
am f6ee0805: (-s ours) am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
...
* commit 'f6ee0805706531ee0e899778a16bec71b5f18ce5':
Fix NPE in layoutlib. DO NOT MERGE
2013-11-18 10:19:39 -08:00
Deepanshu Gupta
5b95025059
am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
...
* commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2':
Add libphonenumber to layoutlib.jar. DO NOT MERGE
2013-11-18 10:15:44 -08:00
Deepanshu Gupta
f6ee080570
am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
...
* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
Fix NPE in layoutlib. DO NOT MERGE
2013-11-18 10:15:40 -08:00
Deepanshu Gupta
ea04da7a18
am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
...
* commit '9570ed561296dd5a0753198706cde152b00f1b24':
Add libphonenumber to layoutlib.jar. DO NOT MERGE
2013-11-18 10:11:50 -08:00
Deepanshu Gupta
42453ede33
am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
...
* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf':
Fix NPE in layoutlib. DO NOT MERGE
2013-11-18 10:11:47 -08:00
Deepanshu Gupta
9570ed5612
Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
2013-11-18 18:08:09 +00:00