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
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
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
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
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
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
Victoria Lease
c403afb642
am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
...
* commit '79007026935acf84baba183aad0ef654d9ed91aa':
use SpannedStringBuilder to build a SpannedString
2013-11-04 21:54:02 -08:00
Brian Carlstrom
94edb33909
am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
...
* commit '10193b78b87a18e5fee7faa4890a01946934000c':
Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-04 21:53:29 -08:00
Newton Allen
04b7821496
am 47feee53: Merge "Fix some documentation typos." into klp-docs
...
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
Fix some documentation typos.
2013-11-04 19:25:58 -08:00
Fabrice Di Meglio
f48bcd5b68
Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev
2013-11-05 00:46:19 +00:00
Fabrice Di Meglio
cad157b370
Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev
2013-11-05 00:45:41 +00:00
Svetoslav
517220b468
Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev
2013-11-04 19:09:49 +00:00
Brian Carlstrom
60999fcb2e
Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
2013-11-04 17:57:15 +00:00
Adam Powell
1262d0c864
Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
2013-11-04 17:55:24 +00:00
Adam Powell
b611eb94e9
Merge "Fix incorrect content description on action bar home/up" into klp-dev
2013-11-04 17:55:05 +00:00
Victoria Lease
3dbea35f7e
Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
2013-11-04 16:23:15 +00:00
Brian Carlstrom
e92f19e58c
Treat UnsatisfiedLinkError as non-fatal
...
Bug: 11466297
Change-Id: I12be43564da37290b3ee52b1858e44f2229711d9
2013-11-03 22:47:11 -08:00
Adam Powell
b411b32861
Fix action menu visibility callbacks for nested popups
...
When opening a submenu from a popup in ActionMenuPresenter, delegate
the submenu callbacks to the presenter callback registered on the
ActionMenuPresenter. This allows menu visibility callbacks to
propagate properly so that apps that hide their action bars after a
timeout can detect open menus that are deeply nested.
Bug 11429613
Change-Id: I3332886f08d4f9010f0875057c457566301d12ec
2013-11-01 18:22:11 -07:00
Adam Powell
f37a5139db
Fix incorrect content description on action bar home/up
...
Some stray code from a previous change caused an erroneous content
description to be set on the wrong view in the action bar. Correct
this and sync with the right behavior.
Bug 10969992
Change-Id: I4deaa3528b4bc222e25354679fa93f8316fa2d70
2013-11-01 16:36:49 -07:00
Brian Carlstrom
a51052d17c
Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
2013-11-01 22:51:07 +00:00
Brian Carlstrom
5637ffced9
Move set of persist.sys.dalvik.vm.lib to SystemServer only
...
Bug: 11463182
Bug: 11479647
Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377
2013-11-01 14:51:58 -07:00
Victoria Lease
24aecc3fb6
am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
...
* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
Handle surrogate pairs in Html.toHtml()
2013-11-01 13:30:51 -07:00
Victoria Lease
ee4c84642a
Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
2013-11-01 20:22:42 +00:00
Michael Wright
d35e94a3cb
am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev
...
* commit '6be8dde6f6447fe56af2a52554bba77ad0ee8d9c':
Only call dump when a ViewRoot actually exists
2013-11-01 13:18:39 -07:00
Michael Wright
4846a93b55
Merge "Only call dump when a ViewRoot actually exists" into klp-dev
2013-11-01 20:11:48 +00:00
Michael Wright
5f48dc7409
Only call dump when a ViewRoot actually exists
...
Bug: 11446494
Change-Id: I47e35d7b4d49d6893ba0c9f8ad05b31f91be85d2
2013-11-01 12:42:49 -07:00
Michael Wright
9730fbc0ea
am cd250cc8: am 17d28ca3: Check view and focus invariants after calling into app
...
* commit 'cd250cc8b781c64df8b8d63853d9082f29a6fc2f':
Check view and focus invariants after calling into app
2013-11-01 12:31:30 -07:00
Michael Wright
17d28ca3d7
Check view and focus invariants after calling into app
...
When we dispatch input events into the actual application, make sure
the input invariants we rely on haven't changed. If they have, we
drop the event and log why.
Bug: 11399505
Change-Id: Id772e41ca41dc332bb02725ab486e3b10a73c220
2013-11-01 19:13:20 +00:00
Adam Lesinski
83c7ac3b8e
Fix off-by-one issue when removing from Iterator
...
MapCollections' iterator removes the preceding element
which causes IndexOutOfBoundsExceptions to be thrown
when removing the first element while iterating.
bug:11477476
Change-Id: Ifc8fcf0ca1651e759f3b2ab8356404564e9f7d0b
2013-11-01 12:00:53 -07:00
Svetoslav
7db97b0a29
PreferenceFragment showing the breadcrumb when not needed.
...
The breadcrumb section is used for a single pane mode for showing
the current user location. The breadcrumb should not be shown if
its title and subtitle are empty. The code in PreferenceActivity
onCreate updates the breadcrumb with the title and subtitle in
a single page mode but does not hide it if they are empty. This
change fixes that.
bug:11242762
Change-Id: Ib1ba9e8afd9d0ab2e85d78a65ca7c18489464f6d
2013-11-01 11:57:12 -07:00
John Spurlock
9b8145f774
am 17433a63: am b7824a94: Merge "Manage keyguard nav elements using transitions." into klp-dev
...
* commit '17433a633a3d415fc1932738c0814c3dc6716683':
Manage keyguard nav elements using transitions.
2013-11-01 11:54:32 -07:00
John Spurlock
56d007b998
Manage keyguard nav elements using transitions.
...
Move the logic for managing dimming the navigation bar
elements on the lockscreen into BarTransitions.
Replace search light + camera assets with new
versions at full brightness, and apply 50% dimming
at runtime, including the IME dismiss button.
Remove unused StatusBarManager _NOP hints.
Improve choreography between camera button +
password security (w/ IME). Fix a few found bugs
in PagedView.
Improve password security unlock transition, manually
fade in back along with the rest of the icons.
Bug:11221659
Change-Id: Ifd1f8c9f400d90542f0ca858b9a4deacabbd518a
2013-11-01 11:33:48 -04:00
Brian Carlstrom
6872435264
am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev
...
* commit '3a9a2089852d18ef7abbb9476fc3455bfec5a880':
Set persist.sys.dalvik.vm.lib at system server startup
2013-10-31 21:39:07 -07:00
Brian Carlstrom
e6411e6810
Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev
2013-11-01 04:32:46 +00:00
Newton Allen
ff236f5fc1
Fix some documentation typos.
...
Change-Id: I0360d468d54d970c87f313e24e50965245206f28
(cherry picked from commit c502744f2d )
2013-11-01 02:38:01 +00:00
Jeff Sharkey
b9c28ce9d4
am 2903d6fa: am c09b6a46: Merge "Better enforcement in DocumentsProvider.call()." into klp-dev
...
* commit '2903d6fa19e90ad4546330431e2a26245dc0d5bc':
Better enforcement in DocumentsProvider.call().
2013-10-31 17:59:47 -07:00
Jeff Sharkey
c09b6a46a3
Merge "Better enforcement in DocumentsProvider.call()." into klp-dev
2013-11-01 00:56:26 +00:00
Svetoslav
c896147c96
am 9eae380b: am a9f28eea: Merge "Temporary detached views not properly reported to accessibility layer." into klp-dev
...
* commit '9eae380badaa8512fd2c3b0e01a0aff276d3636b':
Temporary detached views not properly reported to accessibility layer.
2013-10-31 17:52:10 -07:00
Svetoslav
a9f28eea36
Merge "Temporary detached views not properly reported to accessibility layer." into klp-dev
2013-11-01 00:44:50 +00:00
Svetoslav
1868689417
am acd8741d: am a84e1197: Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev
...
* commit 'acd8741de6610bf3e2ec5ee682f7baa54d1fc383':
Uninitialized UiAutomationConnection incorrectly enforces caller id.
2013-10-31 17:35:50 -07:00