Rob Carr
b57c441fb4
Merge "Fix rotation animation selection." into oc-dev am: e8d7c01e8a
...
am: 0a2b84d6d2
Change-Id: I947689d13d974117273e3e54d4170f8b064927ef
2017-05-02 01:15:35 +00:00
Felipe Leme
e82ea39a51
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev am: 136a48e36a
...
am: 68eecb37d8
Change-Id: If40b81d68913a162f77581b09932647846c992c1
2017-05-02 01:11:25 +00:00
Rob Carr
0a2b84d6d2
Merge "Fix rotation animation selection." into oc-dev
...
am: e8d7c01e8a
Change-Id: Ife07062b479b5cffc6e56a8d46d545c22caf8198
2017-05-02 01:09:25 +00:00
Felipe Leme
68eecb37d8
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev
...
am: 136a48e36a
Change-Id: Ia81cd576c5acdaf0008c21fbea9fb5a16c3c89bf
2017-05-02 01:02:55 +00:00
Rob Carr
e8d7c01e8a
Merge "Fix rotation animation selection." into oc-dev
2017-05-02 01:01:34 +00:00
Jeff Sharkey
8179485886
Merge "Video badging levels: @Deprecate and @remove" into oc-dev am: 0a5b14309a
...
am: 43ddd0f31d
Change-Id: I3f66d8adaed78ea53f52d97e51c986487def3818
2017-05-02 01:01:17 +00:00
TreeHugger Robot
136a48e36a
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev
2017-05-02 00:53:34 +00:00
Jeff Sharkey
43ddd0f31d
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
...
am: 0a5b14309a
Change-Id: Icce4883fe59bede2e91c091b8e4734b7224eb0e3
2017-05-02 00:53:04 +00:00
Jeff Sharkey
0a5b14309a
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
2017-05-02 00:44:51 +00:00
Adam Powell
072661f580
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev am: ba9b2ce254
...
am: d1832d7bf8
Change-Id: Ic5186638644ef7b1654d473c15866476788ccfaa
2017-05-01 23:48:57 +00:00
Adam Powell
d1832d7bf8
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
...
am: ba9b2ce254
Change-Id: I787a726517687d1cec60a0f96d3abef3229a5dcc
2017-05-01 23:37:00 +00:00
Jeff Sharkey
74bfa11974
Merge "Rename to follow API council guidance." into oc-dev am: 0d6c3a691e
...
am: 6560d8845b
Change-Id: Ie9b4a033dfb08ea9326725e66ed4787a1ed69651
2017-05-01 23:36:36 +00:00
TreeHugger Robot
ba9b2ce254
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
2017-05-01 23:30:12 +00:00
Jeff Sharkey
6560d8845b
Merge "Rename to follow API council guidance." into oc-dev
...
am: 0d6c3a691e
Change-Id: I9116471537b51bd3aa785ff21f0bef48ec380889
2017-05-01 23:25:24 +00:00
TreeHugger Robot
0d6c3a691e
Merge "Rename to follow API council guidance." into oc-dev
2017-05-01 23:15:59 +00:00
Svetoslav Ganov
19ef3fceab
Merge "Addess API council comments" into oc-dev am: a9bb97993f
...
am: 58d3836914
Change-Id: I095d5c9a488db01bd3dcf6b3609aa4e928311ca9
2017-05-01 23:00:25 +00:00
Calin Juravle
6958495360
Merge "SystemApi for dex module registration"
2017-05-01 22:56:31 +00:00
Svetoslav Ganov
58d3836914
Merge "Addess API council comments" into oc-dev
...
am: a9bb97993f
Change-Id: I1e521c08500bcdbbfc7fd708baa4762dbb91e39a
2017-05-01 22:52:33 +00:00
TreeHugger Robot
a9bb97993f
Merge "Addess API council comments" into oc-dev
2017-05-01 22:49:02 +00:00
Joe LaPenna
2c60ef0fae
Video badging levels: @Deprecate and @remove
...
Video based badging is not going out in O. Hide video-terminology
constants.
Bug: 37687077
Test: make update-api;
Change-Id: Ibd3a732be11bcd0f6b1077943a34b77f7c971ee3
2017-05-01 15:38:17 -07:00
Jeremy Joslin
1b4fa91eda
Merge "Marking deprecated recommendation request code as @removed." into oc-dev am: 9be76f0129
...
am: ae52148dbd
Change-Id: Id9cc30f5e67cf2f9988774c39f0e224c3366796e
2017-05-01 22:35:20 +00:00
Jeremy Joslin
ae52148dbd
Merge "Marking deprecated recommendation request code as @removed." into oc-dev
...
am: 9be76f0129
Change-Id: I22805cb4f58481fc7ab1176e470cf4a2981101c5
2017-05-01 22:22:44 +00:00
Robert Carr
c0149bf0f6
Fix rotation animation selection.
...
The default activity specified value for rotation animation
should be unset, not ROTATE, so that it will not override
window specified versions.
Bug: 37671120
Test: Rotate camera 180 degrees...expect crossfade or jumpcut depending on APK version but never rotate animation.
Change-Id: I6acbf32b3de0e2848565cc6cb6fb62f625053634
2017-05-01 15:22:22 -07:00
TreeHugger Robot
9be76f0129
Merge "Marking deprecated recommendation request code as @removed." into oc-dev
2017-05-01 22:05:29 +00:00
Adam Powell
f05458cf7e
Hide FragmentContainer#instantiate for API 26
...
Bug 37638617
Change-Id: I065cd31d6ce987155669f72eff0e0d6d8a9430ab
Test: none; hiding API only
2017-05-01 14:26:54 -07:00
Jeff Sharkey
f29d19610d
Rename to follow API council guidance.
...
Test: builds, boots
Bug: 37422404
Change-Id: Idcec897e775f2613805a86209615e389b63bd78d
2017-05-01 15:09:46 -06:00
Svetoslav Ganov
e6b4614d88
Addess API council comments
...
Test: manual
bug:37322491
Change-Id: I2017e667c5452c7ef7c56ec19c594e685700b33a
2017-05-01 13:42:04 -07:00
Casey Burkhardt
9ad7ab04b8
Merge "Fix accessibility button CTS test" into oc-dev am: 921384157d
...
am: 8c12b2138a
Change-Id: Id55f90417710fc44c439eabb6dd8dd573c748b35
2017-05-01 20:06:48 +00:00
Yifan Hong
9f95b592f8
Add android.os.VintfRuntimeInfo
...
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.
Bug: 28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
2017-05-01 13:00:04 -07:00
Casey Burkhardt
8c12b2138a
Merge "Fix accessibility button CTS test" into oc-dev
...
am: 921384157d
Change-Id: Ie1770cf5803e595ac5bf085028ace1879a661499
2017-05-01 19:55:30 +00:00
Casey Burkhardt
921384157d
Merge "Fix accessibility button CTS test" into oc-dev
2017-05-01 19:49:13 +00:00
Jeff Sharkey
a03c9d1640
Merge "Updates based on API council guidance." into oc-dev am: 3ba7117164
...
am: e13d60764c
Change-Id: Ib0a727b11cc24c20d10adf9df85df100f603a87f
2017-05-01 18:52:23 +00:00
Phil Weaver
74aa0b5793
Merge "Use newest scrap view in ListView" into oc-dev am: ecc0e16e32
...
am: e04b73c9a7
Change-Id: I931f0317d495e6bc971f1ac4fc02ea0c20b19cf3
2017-05-01 18:48:28 +00:00
Jeff Sharkey
e13d60764c
Merge "Updates based on API council guidance." into oc-dev
...
am: 3ba7117164
Change-Id: I75953e083e10972dcc44c431ff84bf3977e8d442
2017-05-01 18:43:12 +00:00
Phil Weaver
e04b73c9a7
Merge "Use newest scrap view in ListView" into oc-dev
...
am: ecc0e16e32
Change-Id: I20da3472569c1882f88a56b0e4fd720f75396f7d
2017-05-01 18:40:43 +00:00
Jeff Sharkey
3ba7117164
Merge "Updates based on API council guidance." into oc-dev
2017-05-01 18:36:25 +00:00
Jeff Sharkey
edfa1561c5
Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev
...
am: a5e8bfe999
Change-Id: I4921365f720b18d3488da06cbe94a536e6489478
2017-05-01 18:35:01 +00:00
TreeHugger Robot
ecc0e16e32
Merge "Use newest scrap view in ListView" into oc-dev
2017-05-01 18:31:39 +00:00
Jeff Sharkey
a5e8bfe999
Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev
2017-05-01 18:22:37 +00:00
Jeff Sharkey
b7844e8e7d
Merge "Change String to CharSequence in #loadSummary." into oc-dev am: 63827ce61b
...
am: f0d14afa61
Change-Id: Ib99d458b6f14dba8c3a62a14fb2d845feea611c4
2017-05-01 18:22:23 +00:00
Felipe Leme
c2430f3c4d
Removed deprecated setAuthentication() method that didn't take ids.
...
Such method would cause the AutofillUi to show on all fields, now it only
shows in the fields the service is interested on.
This doesn't solve FillResponse auth on multiple partition, but that will
come soon...
Bug: 37424539
Test: removed hack from testFillResponseAuthJustOneField()
Test: CtsAutoFillServiceTestCases pass
Change-Id: Id97dddfb9fc1630cd6bac96b9bae9d4a2986dd6d
2017-05-01 11:21:54 -07:00
Jeff Sharkey
f0d14afa61
Merge "Change String to CharSequence in #loadSummary." into oc-dev
...
am: 63827ce61b
Change-Id: Ic7a72161a671de50ade75e670e269523dd78f7fe
2017-05-01 18:10:36 +00:00
Jeff Sharkey
63827ce61b
Merge "Change String to CharSequence in #loadSummary." into oc-dev
2017-05-01 17:52:26 +00:00
Jeremy Joslin
2caddc5ef4
Marking deprecated recommendation request code as @removed.
...
Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: Built & ran
Bug: 37357264
Change-Id: I6d55fbad87b11c99e7ddac07cfaa82efeee33187
2017-05-01 10:42:32 -07:00
Salvador Martinez
c06c4ad71d
Merge "Added dialog to notify user of thermal shutdown" into oc-dev am: 4d09adcef1
...
am: ba1cc4bb42
Change-Id: I6d0a0c6dc87bac1470eb4cfccee61c878bed9ee3
2017-05-01 17:01:13 +00:00
Salvador Martinez
ba1cc4bb42
Merge "Added dialog to notify user of thermal shutdown" into oc-dev
...
am: 4d09adcef1
Change-Id: Ic53481e2aa95146bc33c21174b1a50f62bdc8851
2017-05-01 16:55:44 +00:00
Matthew Snider
b38f886fb8
Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev am: ef08871d6b
...
am: fa88787309
Change-Id: Icf3f61c961fcd2684c9b32edd5617f0514445c7d
2017-05-01 16:55:39 +00:00
Matthew Snider
fa88787309
Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev
...
am: ef08871d6b
Change-Id: Ib173b22981d9081c184b024d54671729ec081d11
2017-05-01 16:46:17 +00:00
Salvador Martinez
4d09adcef1
Merge "Added dialog to notify user of thermal shutdown" into oc-dev
2017-05-01 16:45:30 +00:00
Matthew Snider
ef08871d6b
Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev
2017-05-01 16:42:24 +00:00