Alan Viverette
fe2737282f
Merge "Add methods for removing children and actions from A11y nodes"
2013-11-07 23:34:08 +00:00
Robert Greenwalt
d528d48e5d
resolved conflicts for merge of c3eef190 to master
...
Change-Id: I36fd3c7fcbb13e47e27ffc340484c03b5a553bb1
2013-11-07 15:05:26 -08:00
Robert Greenwalt
c3eef19047
am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
...
* commit 'f1612bcfdd2cb517948f14369fd0977ceb55d19c':
Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:39:43 -08:00
Robert Greenwalt
f1612bcfdd
am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
...
* commit 'e8c51298a43f607fea7418ced7cc783e6065fe87':
Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:32:53 -08:00
Robert Greenwalt
e8c51298a4
Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
2013-11-07 18:30:49 +00:00
Dianne Hackborn
c0b5351555
am 03be79b3: am fbf4888d: am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit '03be79b35ca7060f383075a43ff19c8a9d63a7c0':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:24:22 -08:00
Dianne Hackborn
03be79b35c
am fbf4888d: am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit 'fbf4888d19b0c68d8004f9ad2423a583dc01178e':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:21:34 -08:00
Dianne Hackborn
fbf4888d19
am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit '9882d3889957200c3db62f47142988dea99a7291':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:18:53 -08:00
Dianne Hackborn
9882d38899
Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
2013-11-07 18:16:10 +00:00
John Spurlock
0e96652127
am 74bdc178: am de46104a: am 317c79f8: Merge "Docfixes for DownloadManager." into klp-docs
...
* commit '74bdc178cadf0fc895432bf7d305bf5da53a0050':
Docfixes for DownloadManager.
2013-11-06 21:28:14 -08:00
John Spurlock
74bdc178ca
am de46104a: am 317c79f8: Merge "Docfixes for DownloadManager." into klp-docs
...
* commit 'de46104a3797653f6e564ca3774dc9528dd1ac1e':
Docfixes for DownloadManager.
2013-11-06 21:24:09 -08:00
John Spurlock
de46104a37
am 317c79f8: Merge "Docfixes for DownloadManager." into klp-docs
...
* commit '317c79f80b878a4cbc99979a13a1b3c6cf948767':
Docfixes for DownloadManager.
2013-11-07 05:19:33 +00:00
Newton Allen
badb59cd5d
am 47feee53: Merge "Fix some documentation typos." into klp-docs
...
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
Fix some documentation typos.
2013-11-07 05:19:12 +00:00
Robert Greenwalt
a029ea1318
Add BatteryStats for Wifi Batched Scanning.
...
bug:10690989
Change-Id: Ia39b715ee6d5733970095bc76de0ed40ff8208c0
2013-11-06 17:43:18 -08:00
Dianne Hackborn
daa0d5c929
Fix issue #11223338 : Not retaining service started state while restarting
...
When I cleaned up how we maintained the lifecycle of the tracker with a
service, I broke most tracking of the service restart state. (Since at
that point the service is no longer associated with a process, so I
must clean up the tracker state). This change introduces a new special
case for interacting with a service tracker to explicitly tell it when
a service is being restarted. It also fixes how we update the process
state when services are attached to it, so it goes in and out of the
restarting state correctly.
In addition:
- Maybe fix issue #11224000 (APR: Dependent processes not getting added
to LRU list). We were not clearing ServiceRecord.app when bringing
down a service, so if for some reason there were still connections to
it at that point (which could happen for example for non-create bindings),
then we would so it when updating the LRU state of that client process.
- dumpsys procstats's package argument can now be a package or process
name, and we will dump all relevent information we can find about that
name.
- Generally improved the quality of the dumpsys procstats output with its
various options.
- Fixed a bug in ActivityManager.dumpPackageState() where it would hang if
the service was dumping too much, added meminfo to the set of things
dumped, and tweaked command line options to include more data.
- Added some more cleaning code to ActiveServices.killServices() to make
sure we clean out any restarting ServiceRecord entries when a process is
being force stopped.
- Re-arranged ActiveServices.killServices() to do the main killing of the
service first, to avoid some wtf() calls that could happen when removing
connections.
Bug: 11223338
Bug: 11224000
Change-Id: I5db28561c2c78aa43561e52256ff92c02311c56f
2013-11-06 16:42:17 -08:00
John Reck
6e3cc2acae
Merge "Cleanups"
2013-11-07 00:28:18 +00:00
Alan Viverette
f0aed09ed8
Add methods for removing children and actions from A11y nodes
...
BUG: 11421730
Change-Id: Ide396e6a0fec871395a9cadf8880c16d0de08294
2013-11-06 15:33:03 -08:00
Adam Powell
ab42aec4bc
Fix docs
...
Change-Id: Iaeef1812e3dfa76abe40468066860f73d8a10f79
2013-11-06 15:00:36 -08:00
John Reck
339f901ba6
Cleanups
...
Simplify DisplayList creation
Remove unnecessary debug code
Change-Id: I310c9196485c6bf65a6793669bd2dc2b9a8a0a15
2013-11-06 14:53:21 -08:00
Adam Powell
d033e67afe
Merge "Make Scenes and Transitions first-class in PhoneWindow/Themes"
2013-11-06 21:14:03 +00:00
Patrick Tjin
09e0244f72
am b4328566: am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev
...
* commit 'b4328566fa415b69974a9721ec690a1b74880873':
Add HSPA+ to BatteryStats
2013-11-06 10:22:32 -08:00
Patrick Tjin
b4328566fa
am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev
...
* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
Add HSPA+ to BatteryStats
2013-11-06 10:20:00 -08:00
Ruben Brunk
23e1866700
am 57171905: am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
...
* commit '57171905216515a187ecb9931d402c3b09ab4b50':
gcam: Avoid leaking repeating CaptureRequests.
2013-11-06 10:15:29 -08:00
Ruben Brunk
5717190521
am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
...
* commit '6327136cdb1a0438132ea9d91c3b498a034ec071':
gcam: Avoid leaking repeating CaptureRequests.
2013-11-06 10:13:03 -08:00
Patrick Tjin
bd9513f3b2
Merge "Add HSPA+ to BatteryStats" into klp-dev
2013-11-06 18:12:47 +00:00
Ruben Brunk
6fe15c3d5f
Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
2013-11-06 18:07:28 +00:00
Adam Lesinski
2efc144775
am 9aaf4e13: am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
...
* commit '9aaf4e13f0abac9bdee001eb513746c851f22051':
Fix off-by-one issue when removing from Iterator
2013-11-06 09:57:32 -08:00
Adam Lesinski
9aaf4e13f0
am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
...
* commit '35040fdc428669bf7e3a1ec9ea388fb49ede32df':
Fix off-by-one issue when removing from Iterator
2013-11-06 09:54:46 -08:00
Adam Lesinski
1aac29c3dd
Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
2013-11-06 17:49:21 +00:00
Patrick Tjin
b71703cfdf
Add HSPA+ to BatteryStats
...
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.
Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
2013-11-06 17:29:33 +00:00
Adam Powell
18e905f42d
Make Scenes and Transitions first-class in PhoneWindow/Themes
...
Add a window feature for content transitions. This implicitly creates
a Scene for each setContentView operation and runs the appropriate
transition. Applications can specify a TransitionManager XML in their
theme that will apply the appropriate transitions when these implicit
scene changes occur. Apps can specify a "to" with no "from" in a
transition to request an entrance transition for the given
content. This lays the groundwork for further full content
change/activity to activity transitions.
Change-Id: Ic815d9e0b9ce958152d70bf6ee01be075aa9fe88
2013-11-05 17:49:56 -08:00
Jeff Sharkey
8449edb11a
am 2b80a35c: am f5073e71: am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev
...
* commit '2b80a35cb51e6a4f939bdef0cdf8ab39e3f76905':
Clarify DocumentsProvider recents behavior.
2013-11-05 14:23:59 -08:00
Jeff Sharkey
2b80a35cb5
am f5073e71: am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev
...
* commit 'f5073e71c2d5d124865d01ad9343793f6fcf620c':
Clarify DocumentsProvider recents behavior.
2013-11-05 13:56:58 -08:00
John Reck
79d81e68aa
Remove dead code
...
Change-Id: I242eacf68067ffe353802f07d6bfe5bb152fe9d0
2013-11-05 13:28:34 -08:00
Jeff Sharkey
5f4affdab8
Merge "Clarify DocumentsProvider recents behavior." into klp-dev
2013-11-05 20:46:11 +00:00
Jeff Sharkey
37ed78e504
Clarify DocumentsProvider recents behavior.
...
Bug: 11448309
Change-Id: I17e0ac757e549b251e08d58d5ce7d25fb253883f
2013-11-05 12:38:21 -08:00
Fabrice Di Meglio
93c9093a32
am 641bac8e: am 073041c3: am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev
...
* commit '641bac8e21673a2d526b9c0ccf28d5fd08bd6994':
Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
2013-11-04 22:00:22 -08:00
Fabrice Di Meglio
49d6862183
am 346d001b: am 0804ff1f: am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev
...
* commit '346d001b6fae9c5abb0de8d58b3c6d778d3508dc':
Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
2013-11-04 22:00:18 -08:00
Svetoslav
2dc3477e7f
am 109c0a21: am b1dac2f4: am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev
...
* commit '109c0a21938cbab8ae1bde594339cbdf338cb559':
PreferenceFragment showing the breadcrumb when not needed.
2013-11-04 21:59:59 -08:00
Brian Carlstrom
6f1a44f3de
am 5f4a8948: am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
...
* commit '5f4a89480a6f5d3eb6ec7f7979f6555ae083c25f':
Treat UnsatisfiedLinkError as non-fatal
2013-11-04 21:59:53 -08:00
Adam Powell
307182870d
am a20bfd96: am fe803958: am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
...
* commit 'a20bfd96bae95bd54b20ebd184655d7211cedcb4':
Fix action menu visibility callbacks for nested popups
2013-11-04 21:59:49 -08:00
Adam Powell
ccb5b6de00
am b688a0c9: am 9382a071: am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev
...
* commit 'b688a0c9ac41fc5edc2fdbb515f1eda4869989c2':
Fix incorrect content description on action bar home/up
2013-11-04 21:59:45 -08:00
Victoria Lease
8f86d3d28e
am c403afb6: am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
...
* commit 'c403afb6421f0ab840303ac7f5a207067e976e77':
use SpannedStringBuilder to build a SpannedString
2013-11-04 21:59:42 -08:00
Brian Carlstrom
6a429f5604
am 94edb339: am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
...
* commit '94edb3390970c302be926b42e0f8a8da0d5d5960':
Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-04 21:59:23 -08:00
Fabrice Di Meglio
641bac8e21
am 073041c3: am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev
...
* commit '073041c3708b5856a027d32c93c6945e2266336e':
Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
2013-11-04 21:55:31 -08:00
Fabrice Di Meglio
346d001b6f
am 0804ff1f: am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev
...
* commit '0804ff1f5a27239c7bc5b02581585f4a61e72aa6':
Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
2013-11-04 21:55:27 -08:00
Svetoslav
109c0a2193
am b1dac2f4: am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev
...
* commit 'b1dac2f49bd462c9a5f93390ddcc563a7044ea50':
PreferenceFragment showing the breadcrumb when not needed.
2013-11-04 21:54:39 -08:00
Brian Carlstrom
5f4a89480a
am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
...
* commit 'c8b01295bc5dcfcd2d9559f366e175db086eae37':
Treat UnsatisfiedLinkError as non-fatal
2013-11-04 21:54:21 -08:00
Adam Powell
a20bfd96ba
am fe803958: am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
...
* commit 'fe803958d8c38fa865116912cff95c436d6db4e2':
Fix action menu visibility callbacks for nested popups
2013-11-04 21:54:18 -08:00
Adam Powell
b688a0c9ac
am 9382a071: am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev
...
* commit '9382a071612231ee355128f71efb5877550074d9':
Fix incorrect content description on action bar home/up
2013-11-04 21:54:14 -08:00