Wale Ogunwale
a7d447dfde
am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
...
* commit 'c9a0452244420b910ca3294f043f34ccc6a6044c':
@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
2015-06-02 19:11:10 +00:00
Wale Ogunwale
c9a0452244
Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
2015-06-02 18:54:55 +00:00
Robin Lee
cd4aa78063
am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
...
* commit 'f4d9ecc503e7e849ff37a4674680c7213d819592':
Revert "Consistent documentation and annotations for DPMS"
2015-06-02 18:29:57 +00:00
Robin Lee
cf1180c7dc
am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
...
* commit '5de95550b7741bfd7d4da54ea562afb8bb328397':
Consistent documentation and annotations for DPMS
2015-06-02 18:29:53 +00:00
Robin Lee
f4d9ecc503
Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
2015-06-02 18:25:43 +00:00
Robin Lee
49ec19ef6c
Revert "Consistent documentation and annotations for DPMS"
...
This reverts commit 695142a17a .
Change-Id: Iaa2abe7e8bcecc5177a395b0dab8f66cc7100d3d
2015-06-02 18:25:28 +00:00
Robin Lee
5de95550b7
Merge "Consistent documentation and annotations for DPMS" into mnc-dev
2015-06-02 18:16:26 +00:00
Robin Lee
695142a17a
Consistent documentation and annotations for DPMS
...
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.
Deleted or fixed some inconsistent or poorly-worded documentation.
Bug: 21422939
Change-Id: I8d86d0968c2af3595f268828ea1625f1ed256d50
2015-06-02 11:15:34 -07:00
Wale Ogunwale
3540f93654
@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
...
Bug: 21572285
Change-Id: Iff56a8ee5b91e02bd20afb7891bd94a0ec1abba9
2015-06-02 11:07:07 -07:00
Carlos Valdivia
6a316046e8
am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
...
* commit '2ed6369c5d856aa2e1f9972d52f0f3c2526c713a':
System Health: Support expiring tokens
2015-06-02 17:35:49 +00:00
Wei Wang
6ff99d9faa
am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev
...
* commit '6f54da32c9c5c766ba15a6e9cc4be0c27276fc68':
Expose a few system APIs for BLE scan only mode.
2015-06-02 17:35:39 +00:00
Carlos Valdivia
2ed6369c5d
Merge "System Health: Support expiring tokens" into mnc-dev
2015-06-02 17:31:29 +00:00
Wei Wang
6f54da32c9
Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev
2015-06-02 17:24:00 +00:00
Wei Wang
f9e3e9e3dd
Expose a few system APIs for BLE scan only mode.
...
Bug: 21562349
Change-Id: Ifc58efcf01edac5b4f9e5266adb966e7bc492209
2015-06-02 10:22:20 -07:00
Carlos Valdivia
91979be880
System Health: Support expiring tokens
...
In the past android:customTokens=true authenticators were required to handle
their own token caching. This is detrimental for battery when high traffic
authenticators are constantly spinning up processes to start services to do
file io to check their own caches. This change allows authenticator
implementers to optionally let the framework do some of the work for them by
providing the framework with a expiration time.
The AccountManagerService will make a best effort to re-use the cached
token if possible.
Bug: 21530782
Change-Id: I16a7edba36a220e3891e55cf61c725c2be863323
2015-06-02 09:58:18 -07:00
Svet Ganov
9cd64f0d07
am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev
...
* commit '8fa8b95c9d38183497f08efc6bdf4d2c56a4116c':
Respect accessibility importance for before/after node ordering.
2015-06-02 16:57:13 +00:00
Alan Viverette
1ac5554feb
am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev
...
* commit '5431000830551959db15038da8f057c2e993d01a':
Remove strict mode violation from value to string coercion
2015-06-02 16:57:08 +00:00
Svet Ganov
8fa8b95c9d
Merge "Respect accessibility importance for before/after node ordering." into mnc-dev
2015-06-02 16:49:47 +00:00
Alan Viverette
5431000830
Merge "Remove strict mode violation from value to string coercion" into mnc-dev
2015-06-02 16:47:53 +00:00
Svet Ganov
2dca7ca9bf
Respect accessibility importance for before/after node ordering.
...
One can set a view to be visited before/after another one for
accessibility but the before/after target views were always added
to the node info for the view regardless if they are included
for accessiilbity. Now the target viwes are reported only if they
should be included for accessibility.
Change-Id: Iba64e6f0ee0dc090c8c3e6a0a940df8c7ecd49d9
2015-06-02 09:45:19 -07:00
Nitin Shivpure
f9b66d0af8
am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing
...
* commit '1f8b844870eb9acb334b541b0b41de37e000d2f0':
Bluetooth: Fix to avoid framework reboot during monkey testing
2015-06-02 15:14:30 +00:00
Andre Eisenbach
2b656bc139
am 708f57f4: Un-hide connectGatt() variant with selective transport
...
* commit '708f57f4dc34587cd9a0b507fda20555a94c4755':
Un-hide connectGatt() variant with selective transport
2015-06-02 15:13:34 +00:00
Ruben Brunk
8ea83c383e
am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
...
* commit '11df5b66ef621c4d67f5b4980e879784de43fd70':
Track camera and flashlight usage in battery stats.
2015-06-02 15:13:26 +00:00
Clara Bayarri
2d2bf8ad0f
am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev
...
* commit 'a0b77dd5e2a6011291810db392be0981ed73aa97':
Fix TextView ActionMode overflow finishes the ActionMode
2015-06-02 15:13:07 +00:00
Clara Bayarri
3c1253df52
am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev
...
* commit 'd63a177670a5f459f3380daff32e4561b0d5d26c':
Make Text Selection Action Mode secondary items IF_ROOM
2015-06-02 15:13:02 +00:00
Adam Powell
fbb34a16ef
am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev
...
* commit 'fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072':
Don't take the compatibility path for non-primary ActionModes
2015-06-02 15:12:56 +00:00
Svetoslav
6200f5f781
am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev
...
* commit '4982e7b4dce8afe2a5490ac6a6630039946b782f':
Don't add real children for a view with a node provider
2015-06-02 15:12:28 +00:00
Jorim Jaggi
9988fb897a
am 03a7c4c6: Fix shared drawable state
...
* commit '03a7c4c6d4f30416b3fa6e9018f098c0fa41bbd5':
Fix shared drawable state
2015-06-02 15:11:58 +00:00
Selim Gurun
1d00071724
am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev
...
* commit '8a6d511dad3bb38f8cd1ec4557927bc6f307d4ed':
Remove ViewAssistStructure and use the frameworks data structure
2015-06-02 15:11:39 +00:00
Alan Viverette
dcb5ae7b18
am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev
...
* commit 'b0f94ae5d2eec2bb4a0bd1b60eb3db75417c1f8f':
Always send VIEW_CLICKED event from AdapterView.performItemClick()
2015-06-02 15:11:32 +00:00
Eino-Ville Talvala
35cd659800
am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
...
* commit '717a2d09fa2bb8ffb89e9e602ae97056736da4b0':
Camera2: Remove isLoggable
2015-06-02 15:11:27 +00:00
Jeff Brown
3834324e2a
am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev
...
* commit '0505f7f2b5a2e45884a97eeb75c35086a7560c69':
Terminate loop properly when cursor window is full.
2015-06-02 15:11:10 +00:00
Nitin Shivpure
1f8b844870
Bluetooth: Fix to avoid framework reboot during monkey testing
...
When running monkeyrunner, sometimes the framework is disconnected due
to an unhandled Java exception while binding the PAN service (when it
is unsuccessful). Handing the Java exception while binding PAN service
solves this issue.
Change-Id: Idea710593a3f9496305f636042605303e73e7749
2015-06-02 01:23:11 -07:00
Andre Eisenbach
708f57f4dc
Un-hide connectGatt() variant with selective transport
...
Change-Id: I1d3c512160de2bd68550faf243bb151d5cf7f3c9
2015-06-02 02:28:54 +00:00
Ruben Brunk
11df5b66ef
Merge "Track camera and flashlight usage in battery stats." into mnc-dev
2015-06-02 01:48:27 +00:00
Clara Bayarri
a0b77dd5e2
Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev
2015-06-02 01:15:50 +00:00
Clara Bayarri
d63a177670
Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev
2015-06-02 01:15:03 +00:00
Adam Powell
fa3f17f117
Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev
2015-06-02 01:00:06 +00:00
Svetoslav
4982e7b4dc
Merge "Don't add real children for a view with a node provider" into mnc-dev
2015-06-02 00:22:39 +00:00
Svetoslav
762621ced7
Don't add real children for a view with a node provider
...
Change-Id: I1dd43fa5ff93e8eb76e2c7587fb13cd1ef097678
2015-06-01 17:21:59 -07:00
Jorim Jaggi
03a7c4c6d4
Fix shared drawable state
...
Not calling mutate here had a side-effect making the icon in the
status bar untintable in SysUI.
Bug: 21566007
Change-Id: Ifb78c81ba7f04d496f14031ef635a6e964e6280e
2015-06-01 23:59:00 +00:00
Ruben Brunk
6d2c363fd5
Track camera and flashlight usage in battery stats.
...
Bug: 15986092
Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb
2015-06-01 16:54:23 -07:00
Selim Gurun
8a6d511dad
Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev
2015-06-01 23:53:11 +00:00
Alan Viverette
b0f94ae5d2
Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev
2015-06-01 23:52:36 +00:00
Eino-Ville Talvala
717a2d09fa
Merge "Camera2: Remove isLoggable" into mnc-dev
2015-06-01 23:47:32 +00:00
Alan Viverette
376c32f268
Always send VIEW_CLICKED event from AdapterView.performItemClick()
...
This makes it consistent with View.performClick().
Bug: 19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d
2015-06-01 16:41:42 -07:00
Selim Gurun
50b26a5c27
Remove ViewAssistStructure and use the frameworks data structure
...
As part of the API rename from ViewAssistStructure to ViewStructure,
we added a temporary workaround to prevent build breakage. Remove
the temporary workaround since the current unbundled webview package
implements the updated onProvideVirtualStructure API.
Change-Id: I13a5b8dee3e856eb585de53a0750bd52c7a909a7
2015-06-01 23:41:12 +00:00
Jeff Brown
0505f7f2b5
Merge "Terminate loop properly when cursor window is full." into mnc-dev
2015-06-01 23:34:25 +00:00
Jeff Brown
bb8c841e90
Terminate loop properly when cursor window is full.
...
The existing code exits the column-filling loop immediately but
may continue to try to fill rows. Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later. Fixed this problem by exiting the row-
filling loop promptly.
Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
2015-06-01 16:33:24 -07:00
Adrian Roos
1c147b5026
am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev
...
* commit 'c45d6c30a58062af05d8232fd0f020e3f854bb8a':
Translucent bars in landscape
2015-06-01 23:29:38 +00:00