Baligh Uddin
6434acb58f
Merge "Import translations. DO NOT MERGE"
2013-06-12 23:39:46 +00:00
Wink Saville
9ddd70b92c
am ac6c8621: am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
...
* commit 'ac6c862196a62855e5c48d78b2a509943ec300b5':
Allow carrier provisioning to turn toggle radio power.
2013-06-12 16:19:50 -07:00
Wink Saville
ac6c862196
am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
...
* commit '30af45f47fd71feee0f9e5f8e049ba0380bc7793':
Allow carrier provisioning to turn toggle radio power.
2013-06-12 16:16:45 -07:00
Wink Saville
30af45f47f
Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
2013-06-12 23:13:06 +00:00
Craig Mautner
ac5396a3a8
Merge "Centralize all system InputEventReceiver monitors."
2013-06-12 23:07:39 +00:00
Svetoslav Ganov
554ec841ab
Merge "Revert "Generate PDF from Canvas.""
2013-06-12 23:07:13 +00:00
Svetoslav Ganov
7a56be0915
Revert "Generate PDF from Canvas."
...
This reverts commit 923c633ccfda45312fec5a3484b6cc1308cc71ab
Change-Id: Ie49f593ec702c1ecf96a5cc1fafa680c1db08747
2013-06-12 23:06:46 +00:00
Michael Wright
3a59cb8003
Merge "Fix possible NPE in PointerLocationView"
2013-06-12 23:03:08 +00:00
Baligh Uddin
c31687eb4a
am 414fec25: (-s ours) am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '414fec25225acc5b6fc40c1ce92a84ae95b3fce2':
Import translations. DO NOT MERGE
2013-06-12 14:30:13 -07:00
Baligh Uddin
e014948f2f
am 05cb82ca: (-s ours) am 96acc0e5: Import translations. DO NOT MERGE
...
* commit '05cb82caeed3d1b710c74cbba5ac97ee61c1d8ae':
Import translations. DO NOT MERGE
2013-06-12 14:30:10 -07:00
Svetoslav Ganov
923c633ccf
Generate PDF from Canvas.
...
This change adds simple APIs that enable an Android application
to generate a PDF document by drawing content on a canvas.
Change-Id: Iddcd126b3af37c73d99262f6b276caa07b998c1d
2013-06-12 14:20:26 -07:00
Alan Viverette
4602a709d8
Merge "Allow adding headers and footers to ListView after setAdapter()."
2013-06-12 21:12:54 +00:00
Baligh Uddin
414fec2522
am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '909b6db6a327c2102bbcaa56720428319d0d4e94':
Import translations. DO NOT MERGE
2013-06-12 13:17:49 -07:00
Baligh Uddin
05cb82caee
am 96acc0e5: Import translations. DO NOT MERGE
...
* commit '96acc0e5f16ef575e306eb8217484a5f3471f917':
Import translations. DO NOT MERGE
2013-06-12 13:17:47 -07:00
Baligh Uddin
909b6db6a3
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-06-12 20:16:34 +00:00
Alan Viverette
72e2f2a940
Allow adding headers and footers to ListView after setAdapter().
...
Bug: 6110394
Change-Id: I0238ff91b6ae3159b2350d5210545425ac7340f3
2013-06-12 12:56:29 -07:00
Alan Viverette
a6954f7e12
Merge "Add getters for ListView header & footer divider drawing attrs."
2013-06-12 19:49:13 +00:00
Alan Viverette
a420b53d37
Merge "Clean up FastScroller. Expand overlay to fit text content."
2013-06-12 19:48:53 +00:00
Dianne Hackborn
0149db4693
Merge "Improve process tracking."
2013-06-12 19:40:18 +00:00
Michael Wright
2f1cd7e68b
Fix possible NPE in PointerLocationView
...
Change-Id: I36577d6882db898ff4d4d9090454cdf71a440fd5
2013-06-12 12:11:17 -07:00
John Spurlock
0497a3030c
Merge "Organize the imports in systemui."
2013-06-12 18:51:35 +00:00
John Spurlock
de84f0e77e
Organize the imports in systemui.
...
To follow android conventions, more importantly to remove the
unused.
Change-Id: I75881718e84360a579a3b02c26489ad250bc9227
2013-06-12 14:50:47 -04:00
Dianne Hackborn
78a369c90f
Improve process tracking.
...
We now keep track of when each process is running, batched
by the current memory status of the device. In addition,
the stats are organized by package first, and then processes
associated with each package inside of that. Finally, we
also keep track of the overall time spent in each memory
status.
This should start to actually get us to some information
we can reach some conclusions about. The total time spent
in each memory status gives us some indication of how much
we are running while memory is low; the new package organization
batched by memory status lets us see what packages have
what processes running when memory is low.
Change-Id: I389d62d39d115a846126cf354e4c20070d8f1180
2013-06-12 11:45:27 -07:00
John Spurlock
7ac4fc4cb8
Merge "Remove only file in systemui with windows line endings."
2013-06-12 18:45:05 +00:00
Dianne Hackborn
2321d242b4
Merge "ArrayMap is great, so how about ArraySet!"
2013-06-12 18:35:50 +00:00
Craig Mautner
037aa8d434
Centralize all system InputEventReceiver monitors.
...
Implement all system level InputEvent monitors as new
InputEventListeners. Only one InputChannel required and monitoring
can be enabled or disabled by registering with WindowManagerService.
Change-Id: I64714ab858342ed183c62b421098478ffb6637bc
2013-06-12 10:59:16 -07:00
Baligh Uddin
d4f64a317a
Import translations. DO NOT MERGE
...
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
2013-06-12 10:38:17 -07:00
John Spurlock
43cfbed80c
Remove only file in systemui with windows line endings.
...
Change-Id: I7b0e8b58a7c14afa6d2e7c1ce97ebacc5ffbb538
2013-06-12 12:54:06 -04:00
Baligh Uddin
96acc0e5f1
Import translations. DO NOT MERGE
...
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
2013-06-12 09:52:55 -07:00
Baligh Uddin
66b9cb2549
Import translations. DO NOT MERGE
...
Change-Id: Ib7914f77925d5edb99c62999ff3ae29856adf399
Auto-generated-cl: translation import
2013-06-12 09:50:05 -07:00
The Android Open Source Project
97f41383eb
am fabda589: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit 'fabda5894c2793b37650ce3bc1697effd86af88b':
Need to explicitly disable scan-always when turning off wifi
Let RemoteControlDisplay know more about playback position
Unhide MediaExtractor.getPsshInfo()
2013-06-12 07:25:57 -07:00
The Android Open Source Project
fabda5894c
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: Ife328fef3a7cc1a88562fd88a85daa626b19c930
2013-06-12 07:23:31 -07:00
The Android Automerger
b543526c97
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-12 05:55:58 -07:00
Torne (Richard Coles)
e151d9b3c7
Merge "WebViewChromium: don't use a separate class loader."
2013-06-12 12:25:43 +00:00
Christopher Tate
0041684255
Need to explicitly disable scan-always when turning off wifi
...
... when you want wifi to be really most sincerely off, because
settings restore is about to rewrite the conf file.
Bug 9032154
Change-Id: I6a3a34ac3f14ec43aa9d9cc0159fca6168ccd0a2
2013-06-11 17:53:08 -07:00
Jean-Michel Trivi
d61650a0ad
Let RemoteControlDisplay know more about playback position
...
The BT stack needs to differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
Bug 9294855
Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
2013-06-11 17:52:58 -07:00
Marco Nelissen
05e2b6be66
Unhide MediaExtractor.getPsshInfo()
...
b/9373882
Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
2013-06-11 17:52:50 -07:00
Alan Viverette
5542103589
Add getters for ListView header & footer divider drawing attrs.
...
Bug: 6104055
Change-Id: I874d631ec6fbb0e99790a3f37d00d589c1d63d34
2013-06-11 17:50:56 -07:00
Romain Guy
1e4795ab64
Merge "Avoid 9patch cache lookups when possible"
2013-06-12 00:23:27 +00:00
Romain Guy
4c2547fa92
Avoid 9patch cache lookups when possible
...
This optimization saves up to 0.3ms per frame on the Play Store's
front page, on a Nexus 4 device.
Change-Id: Iaa4ef33c6e3b37e175efd5b9eea9ef59b43f14f3
2013-06-11 17:14:59 -07:00
Dianne Hackborn
fc74f85f2e
Merge "Fix build."
2013-06-12 00:14:45 +00:00
Dianne Hackborn
fd20604704
Fix build.
...
Change-Id: I166c744e0f6bf62ac06b4797b87e064e14d0b85e
2013-06-11 17:13:52 -07:00
Jeff Sharkey
126713d8d7
Merge "Explicit locale when formatting machine strings."
2013-06-11 23:52:17 +00:00
Dianne Hackborn
a283fc9518
Merge "Add new API to retrieve a dumpsys of a single package."
2013-06-11 23:33:32 +00:00
Igor Murashkin
4d3adce05a
Merge "Fix build break due to javadoc linking error"
2013-06-11 22:59:05 +00:00
Glenn Kasten
5c137a7688
Merge "Fix build"
2013-06-11 22:41:14 +00:00
Christopher Tate
2b3329bb73
am 1bc14ed9: am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
...
* commit '1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb':
Need to explicitly disable scan-always when turning off wifi
2013-06-11 15:37:12 -07:00
The Android Open Source Project
b243f791d6
am 799f031a: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '799f031a64d3930b85b9232bac344b1f9f216717':
Import translations. DO NOT MERGE
Do not allow 0 or smaller periodicity for syncs. b/9295383
Save Notification large icon to extras.
Workaround possible use after delete
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
Don't orphan footers with transient state Bug #8725945
Avoid logging sensitive data.
2013-06-11 15:37:06 -07:00
Glenn Kasten
2a6b702521
Fix build
...
Change-Id: Iacac057570e9fcfe850ee597c0a26b2d06ab7910
2013-06-11 15:36:06 -07:00
Igor Murashkin
a1b02dbb6e
Fix build break due to javadoc linking error
...
Change-Id: I9da1cb03afef25c11844ec863200f7b5b009e77a
2013-06-11 15:25:20 -07:00