Vladislav Kaznacheev
ee10f27cbe
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am: 0964a2d9fc
...
am: 2679fe4e95
2017-04-13 03:57:09 +00:00
Vladislav Kaznacheev
2679fe4e95
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
...
am: 0964a2d9fc
2017-04-13 03:47:25 +00:00
TreeHugger Robot
0964a2d9fc
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
2017-04-13 03:36:30 +00:00
TreeHugger Robot
63e9903f3d
Merge "Address API review for ProxyFileDescriptorCallback"
2017-04-13 02:30:14 +00:00
TreeHugger Robot
2cafa2db05
Merge "Remove support for auto-paging of cursors."
2017-04-13 00:32:05 +00:00
Chad Brubaker
9e6bb31110
Merge "Expose more settings to Instant Apps" into oc-dev am: 055b51af28
...
am: a927a8c3ba
2017-04-13 00:22:49 +00:00
Evan Rosky
dc4792c10e
Merge "Fix focus ordering with duplicate ids" into oc-dev am: a0ce440d60
...
am: 33f6bcb71d
2017-04-13 00:19:06 +00:00
Chad Brubaker
a927a8c3ba
Merge "Expose more settings to Instant Apps" into oc-dev
...
am: 055b51af28
2017-04-13 00:11:16 +00:00
Evan Rosky
33f6bcb71d
Merge "Fix focus ordering with duplicate ids" into oc-dev
...
am: a0ce440d60
2017-04-13 00:06:42 +00:00
Chad Brubaker
055b51af28
Merge "Expose more settings to Instant Apps" into oc-dev
2017-04-12 23:51:42 +00:00
Evan Rosky
a0ce440d60
Merge "Fix focus ordering with duplicate ids" into oc-dev
2017-04-12 23:50:04 +00:00
Roozbeh Pournader
252093e36f
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev am: d39388219f
...
am: 4d56a0019a
2017-04-12 23:49:15 +00:00
Lorenzo Colitti
23cbbe1c73
Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp
...
am: a7e30062c9
2017-04-12 23:45:57 +00:00
Roozbeh Pournader
4d56a0019a
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev
...
am: d39388219f
2017-04-12 23:37:03 +00:00
Roozbeh Pournader
d39388219f
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev
2017-04-12 23:22:40 +00:00
Android Build Merger (Role)
a7e30062c9
Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp
2017-04-12 23:00:13 +00:00
Lorenzo Colitti
c34f0f7520
Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1
...
am: cfd729093f
2017-04-12 22:58:42 +00:00
Jiaquan He
7ed2b1adeb
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
...
am: 18d993bb72
2017-04-12 22:56:15 +00:00
Jiaquan He
d415eac183
Draw a default focus highlight if needed.
...
am: 8062949ece
2017-04-12 22:54:17 +00:00
Jiaquan He
557922d37a
Add a public API defaultFocusHighlightEnabled.
...
am: b7daaf8b5f
2017-04-12 22:53:09 +00:00
Jiaquan He
4bd8bce6d7
Detect unhandled keyboard focused state.
...
am: 4a81674b45
2017-04-12 22:51:56 +00:00
Lorenzo Colitti
cfd729093f
Merge changes from topic 'network_specifier' am: d0f476bdae
...
am: 362bef45d1
2017-04-12 22:48:55 +00:00
TreeHugger Robot
18d993bb72
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
...
* changes:
Fix broken CTS tests.
Draw a default focus highlight if needed.
Add a public API defaultFocusHighlightEnabled.
Detect unhandled keyboard focused state.
2017-04-12 22:40:15 +00:00
Jakub Pawlowski
19d6662777
Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b am: ce8de6c3f7
...
am: 2ef7bb7b06
2017-04-12 22:29:26 +00:00
Lorenzo Colitti
d0f476bdae
Merge changes from topic 'network_specifier'
...
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
2017-04-12 22:27:37 +00:00
Svet Ganov
cb98d9d6f3
Merge "Add autofill feature API" into oc-dev am: a402d6dd2f
...
am: bbef731c2d
2017-04-12 22:22:39 +00:00
Dianne Hackborn
7ee8c9a485
Merge "Add API to get a uid's current importance." into oc-dev am: ad6ab44e15
...
am: ef95ec85ea
2017-04-12 22:21:30 +00:00
Selim Gurun
d07efb9ce3
Merge "Deprecate findAddress() method" into oc-dev am: c68b1a8aef
...
am: 24d68dc3d8
2017-04-12 22:12:57 +00:00
Jakub Pawlowski
2ef7bb7b06
Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b
...
am: ce8de6c3f7
2017-04-12 21:56:26 +00:00
Jakub Pawlowski
ce8de6c3f7
Merge "Bluetooth 5 PHY simplification" am: a9acf9db97
...
am: d43127865b
2017-04-12 21:45:52 +00:00
nharold
5f676fa7b6
Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
...
am: 9a5d047750
2017-04-12 21:43:27 +00:00
Jesse Evans
93b7acddf8
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am: 684b5381e9
...
am: 3d1676cfc4
2017-04-12 21:35:09 +00:00
Svet Ganov
bbef731c2d
Merge "Add autofill feature API" into oc-dev
...
am: a402d6dd2f
2017-04-12 21:28:45 +00:00
Dianne Hackborn
ef95ec85ea
Merge "Add API to get a uid's current importance." into oc-dev
...
am: ad6ab44e15
2017-04-12 21:27:27 +00:00
Jakub Pawlowski
a9acf9db97
Merge "Bluetooth 5 PHY simplification"
2017-04-12 21:22:29 +00:00
Selim Gurun
24d68dc3d8
Merge "Deprecate findAddress() method" into oc-dev
...
am: c68b1a8aef
2017-04-12 21:19:16 +00:00
TreeHugger Robot
a402d6dd2f
Merge "Add autofill feature API" into oc-dev
2017-04-12 21:17:33 +00:00
Dianne Hackborn
ad6ab44e15
Merge "Add API to get a uid's current importance." into oc-dev
2017-04-12 21:11:46 +00:00
Selim Gurun
c68b1a8aef
Merge "Deprecate findAddress() method" into oc-dev
2017-04-12 21:05:07 +00:00
nharold
37f48f4596
Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b am: 176bfb58c6
...
am: a237a34085
2017-04-12 20:53:17 +00:00
Steve McKay
4677c2b7f0
Remove support for auto-paging of cursors.
...
Auto-paging of cursors is being removed in favor of a support lib component.
Rationale:
1) Auto-paging as implemented has potential to negatively impact system health.
2) Similar functionality w/o system health concerns can be provided
specific to RecyclerView.
Test: Removed. CTS coverage updated.
Bug: 30927484
Change-Id: I43e62181d8ceeeba6265d44536967a2102751320
2017-04-12 13:51:50 -07:00
Nathan Harold
3fa4a92b8c
IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 am: 9c2428ad4d
...
am: 99c50add4f
2017-04-12 20:51:41 +00:00
Jesse Evans
3d1676cfc4
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
...
am: 684b5381e9
2017-04-12 19:52:07 +00:00
TreeHugger Robot
684b5381e9
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
2017-04-12 19:39:16 +00:00
Charles He
066b8d8b5f
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev am: 9f074e2224
...
am: fd7eb11a2b
2017-04-12 18:45:49 +00:00
nharold
a237a34085
Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b
...
am: 176bfb58c6
2017-04-12 18:39:15 +00:00
Nathan Harold
99c50add4f
IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35
...
am: 9c2428ad4d
2017-04-12 18:37:23 +00:00
Charles He
fd7eb11a2b
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
...
am: 9f074e2224
2017-04-12 18:36:10 +00:00
Siyamed Sinir
e1f3987ddb
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev am: 37bfd57ead
...
am: fcbc2800db
2017-04-12 18:33:39 +00:00
Nathan Harold
9c2428ad4d
IpSecManager and IpSecAlgorithm API Tweaks
...
am: 6045429b35
2017-04-12 18:27:09 +00:00
