Commit Graph

17219 Commits

Author SHA1 Message Date
Alan Viverette
35eb249ebb Merge "Annotate test method visibility in WindowManager" into oc-dev
am: 0b83588177

Change-Id: I0393d702b3fd308dd16becefceea15f932fea599
2017-06-02 17:34:38 +00:00
TreeHugger Robot
0b83588177 Merge "Annotate test method visibility in WindowManager" into oc-dev 2017-06-02 17:26:54 +00:00
Alan Viverette
39259dd33c Annotate test method visibility in WindowManager
Change-Id: I36714b4eb39c937cc3c42fac604fd0fa9900ae47
Fixes: 62066862
Test: n/a
2017-05-31 15:06:09 -04:00
Peter Qiu
421018f44b Merge changes from topic 'hide_passpoint_r2' into oc-dev
am: 4bd47fce86

Change-Id: I71fe905c7842384d7700f02f923b12cdae9bf594
2017-05-30 18:55:37 +00:00
TreeHugger Robot
4bd47fce86 Merge changes from topic 'hide_passpoint_r2' into oc-dev
* changes:
  hotspot2: hide Release 2 APIs
  Voice Messaging Intent API.
2017-05-30 18:47:12 +00:00
Peter Qiu
ff323d3ce9 hotspot2: hide Release 2 APIs
These APIs are based on the design of the legacy OSU app.  Since
the app will be redesigned, hide these APIs for now.

Bug: 38260972
Test: build
Change-Id: I56b9c27305624306773284a7cc1721606037462d
2017-05-30 09:47:43 -07:00
Renat Aksitov
931983d607 Voice Messaging Intent API.
Removing EXTRA_SENDER_ACCOUNT_HASH, needs more work.

Bug 37747843

Test: make -j11 docs

Change-Id: I3046611510f85cf69ceff7c2274cda3b692581b9
(cherry picked from commit 2c4201448e)
2017-05-30 09:47:42 -07:00
Jiaquan He
74282f0745 Check state_focus in foreground.
am: 0bdf1c9c76

Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53
2017-05-27 00:19:35 +00:00
TreeHugger Robot
759669988b Merge changes from topic 'highlight_fixed' into oc-dev
* changes:
  Check default focus highlight for ImageView.
  Check state_focus in foreground.
2017-05-27 00:11:10 +00:00
Tony Mak
754f6e22b0 Merge "Remove the old version of setAffiliationIds" into oc-dev
am: 8d902a9e28

Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6
2017-05-26 13:06:23 +00:00
Jiaquan He
0bdf1c9c76 Check state_focus in foreground.
This commit checks whether the state_focus is specified in the
foreground of a view. If it is, the default focus highlight won't
show up.

Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.View_DefaultFocusHighlightTest#testIsDefaultFocusHighlightNeeded
Bug: 37288730
Change-Id: I5256eb656c1b8729d685edb914e867ee9a3a92a4
2017-05-24 16:13:38 -07:00
Tony Mak
8c6969b69b Remove the old version of setAffiliationIds
Test: Can build

Build: 37622682

Change-Id: I07e630e96f5aed5d450652c465e00ffed13a2a2c
2017-05-17 15:20:04 +00:00
Jeremy Joslin
964cddccda Merge "Remove deprecated recommendation request code." into oc-dev
am: b2bd32929b

Change-Id: I0efb561f7829598eb5a509474e1a6e54e00bb93d
2017-05-16 19:02:40 +00:00
TreeHugger Robot
b2bd32929b Merge "Remove deprecated recommendation request code." into oc-dev 2017-05-16 18:44:28 +00:00
Ian Pedowitz
b6290ff39e Merge "Revert "Revert "O is API 26""" into oc-dev
am: 655ab3f59b

Change-Id: I28655c728468f2348b2ba83b77f2aae3d7b22c06
2017-05-16 04:02:51 +00:00
Ian Pedowitz
9ebb128c40 Merge "Revert "Revert "Resource ID fixup.""" into oc-dev
am: a11196074b

Change-Id: I1ea7b4a17bf7ba6de43db52e996aff4c56dc3bf0
2017-05-16 04:00:05 +00:00
Ian Pedowitz
655ab3f59b Merge "Revert "Revert "O is API 26""" into oc-dev 2017-05-16 03:33:05 +00:00
Ian Pedowitz
a11196074b Merge "Revert "Revert "Resource ID fixup.""" into oc-dev 2017-05-16 03:32:33 +00:00
Kenny Guy
ddf5448ef9 Merge "Cleanup API that is already @removed" into oc-dev
am: 33b4964874

Change-Id: I933de065f75417e16541c86089e981b3a9fbd362
2017-05-12 03:51:39 +00:00
TreeHugger Robot
33b4964874 Merge "Cleanup API that is already @removed" into oc-dev 2017-05-12 00:13:56 +00:00
Jeremy Joslin
9407a9490b Remove deprecated recommendation request code.
Removed all deprecated code related to network recommendation
requests.

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.netrec.NetRecHostTest
Bug: 37357264
Change-Id: I81bb6ff6236b249b8e14058c1bfdb938451a75b0
2017-05-11 15:43:57 +00:00
Kenny Guy
653c32432d Cleanup API that is already @removed
EVICT_CE_KEY was @removed before API freeze
now removing it entirely.

Bug: 37663081
Test: compiles
Change-Id: I9ab318196cfe2da601be65b26a3b579f2f4bad82
2017-05-11 12:44:23 +01:00
Jakub Pawlowski
fec6ef8e90 Bluetooth: Fix interval low/min values
Bug: 38175945
Test: none
Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6
(cherry picked from commit 6b1f39502c)
2017-05-10 01:30:31 +00:00
Andre Eisenbach
4246cc309d Merge "Bluetooth: Fix interval low/min values" am: 66deee2bd4 am: 0771cb13a2
am: 1655862b93

Change-Id: I32d56c5d0fca7947ac754eda100b36f2ee94ffe7
2017-05-10 00:15:32 +00:00
Jakub Pawlowski
6b1f39502c Bluetooth: Fix interval low/min values
Bug: 38175945
Test: none
Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6
2017-05-09 22:59:18 +00:00
Ian Pedowitz
c96a358318 Merge "Revert "O is API 26"" into oc-dev
am: b42b9a22df

Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
2017-05-04 00:18:19 +00:00
Ian Pedowitz
967869d0ed Revert "Revert "O is API 26""
This reverts commit 12025857cd.

Bug: 37480230
Bug: 37355569
Change-Id: I315b8c18a79d0dcd6be84c3d2af120b073144a9e
2017-05-04 00:10:04 +00:00
Ian Pedowitz
b42b9a22df Merge "Revert "O is API 26"" into oc-dev 2017-05-04 00:07:10 +00:00
Ian Pedowitz
12025857cd Revert "O is API 26"
This reverts commit 9bcef8e2da.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
2017-05-03 22:00:56 +00:00
Winson Chung
3d66fb6519 Merge "Restoring old methods for compatibility." into oc-dev
am: d6c190c8d2

Change-Id: I306a8520873eb76182f3b04617265f5bf662aaf8
2017-05-02 23:27:48 +00:00
Winson Chung
d6c190c8d2 Merge "Restoring old methods for compatibility." into oc-dev 2017-05-02 23:19:29 +00:00
Winson Chung
ca754789c1 Restoring old methods for compatibility.
Bug: 37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c
2017-05-02 15:18:23 -07:00
Michael Wright
8433705f77 Merge "O is API 26" into oc-dev
am: 074a67c116

Change-Id: Ie1d9b8ebb3b1c1693bbce5bf7f7d1f8c7159e54e
2017-05-02 22:17:25 +00:00
Michael Wright
5a0cfda17e Revert "Revert "Resource ID fixup.""
This reverts commit 30de4cff12dfcf0c2b54a5950db40b8f7e873de2.

Bug: 37480230
Test: build
Change-Id: I2884d10835ac7c99a6e2ab8756354847138b7a82
2017-05-02 21:41:11 +01:00
Michael Wright
14a2cb946f Revert "Resource ID fixup."
This reverts commit e6d161554f.

Bug: 37480230
Test: build
Change-Id: I2322c34132c5c8761d7506b00b2a8cdd286a5e48
2017-05-02 21:35:55 +01:00
Michael Wright
e6d161554f Resource ID fixup.
Remove unused resources and assign IDs to the remaining ones.

Bug: 37480230
Test: build
Change-Id: Ife792e38ae1b7b2bf6b176a52929bc3e1fa16060
2017-05-02 21:35:20 +01:00
Michael Wright
9bcef8e2da O is API 26
Bug: 37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1
2017-05-02 19:23:12 +01:00
Narayan Kamath
194f8471fd Merge "Track libcore change 03e8c7dca78a95ccf719a7." 2017-05-02 10:06:49 +00:00
Casey Burkhardt
7a0de65bee Merge "Refactor accessibility button support detection" into oc-dev
am: 337e2aae53

Change-Id: I4f96a5ae3e847b2439d017b34038a4b7b07965fa
2017-05-02 04:11:01 +00:00
Casey Burkhardt
337e2aae53 Merge "Refactor accessibility button support detection" into oc-dev 2017-05-02 04:05:30 +00:00
Peter Qiu
10da2c2d84 Merge "hotspot2: hide Release 2 APIs" into oc-dev
am: 39da850a95

Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9
2017-05-02 01:52:44 +00:00
TreeHugger Robot
39da850a95 Merge "hotspot2: hide Release 2 APIs" into oc-dev 2017-05-02 01:44:44 +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
d1832d7bf8 Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
am: ba9b2ce254

Change-Id: I787a726517687d1cec60a0f96d3abef3229a5dcc
2017-05-01 23:37:00 +00:00
TreeHugger Robot
ba9b2ce254 Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev 2017-05-01 23:30:12 +00:00
Hyunyoung Song
090109cb19 Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
am: 1e8f451bbf

Change-Id: I9d95fdcd56ccf99fe497b68f85fd5db036548a83
2017-05-01 23:28:48 +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
Peter Qiu
a9f9889218 hotspot2: hide Release 2 APIs
Bug: 37514629
Test: builds
Change-Id: Idcd684cf9846791cb02ae0f74ec35ff4850666f1
2017-05-01 16:22:24 -07:00
TreeHugger Robot
1e8f451bbf Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev 2017-05-01 23:18:41 +00:00