Phil Weaver
88ac6d9605
Merge "Make a11y clickable span work after node recycle" into oc-dev am: 5d25f429bf
...
am: 0b3408a369
2017-04-20 16:59:33 +00:00
Jesse Hall
81cacd871d
Merge "Merge "Vulkan compute 0 only requires variable pointers" into oc-dev am: 45ff1d1ad3" into oc-dev-plus-aosp
...
am: 61244e64a6
2017-04-20 16:56:38 +00:00
Bryce Lee
ee05c604f8
Merge "Merge "Deprecate Activity#requestVisibleBehind" into oc-dev am: e4b6441198" into oc-dev-plus-aosp
...
am: d0ead2aa95
2017-04-20 16:50:02 +00:00
Abodunrinwa Toki
e0a8e5bcef
Merge "Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev am: 06a53d4729" into oc-dev-plus-aosp
...
am: 528adaed4f
2017-04-20 16:44:24 +00:00
Andrei Stingaceanu
3926110944
Merge "Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev am: 635d9dd864" into oc-dev-plus-aosp
...
am: 19eafb9534
2017-04-20 16:41:59 +00:00
Abodunrinwa Toki
c63a0033f8
Merge "Merge "TRON: Log "textAssist" actions." into oc-dev am: fa9d889d3e" into oc-dev-plus-aosp
...
am: a039aa4439
2017-04-20 16:39:54 +00:00
Clara Bayarri
fb164c34f2
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev am: 1ef45a8bed
...
am: 18d539cd0a
2017-04-20 16:31:49 +00:00
Erik Kline
57c252b9b1
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79 am: 6af3dd0fc3 am: 3fa8908370
...
am: c9ee35581c
2017-04-20 16:29:52 +00:00
Hugo Benichi
b028d18f8a
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69 am: 23ee1621c7 am: b51307e12e
...
am: 7b8fc6ea79
2017-04-20 16:28:06 +00:00
Erik Kline
51e9169edd
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1 am: 0d1f04384f am: d9bfb83d96
...
am: 372edc3b7d
2017-04-20 16:22:44 +00:00
Phil Weaver
0b3408a369
Merge "Make a11y clickable span work after node recycle" into oc-dev
...
am: 5d25f429bf
2017-04-20 16:22:43 +00:00
Jesse Hall
39368e0f01
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
...
am: 45ff1d1ad3
2017-04-20 16:15:50 +00:00
Bryce Lee
08cda62574
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
...
am: e4b6441198
2017-04-20 16:12:54 +00:00
Jocelyn Dang
cc63daaf55
Merge "Add min and max learned battery capacity to batterystats." into oc-dev am: b2aa0ceb0d
...
am: f29eb24c4e
2017-04-20 16:08:48 +00:00
Abodunrinwa Toki
d5857c4e9f
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
...
am: 06a53d4729
2017-04-20 16:08:24 +00:00
Andrei Stingaceanu
c033cf3a73
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
...
am: 635d9dd864
2017-04-20 16:07:03 +00:00
Abodunrinwa Toki
1ecfa26c90
Merge "TRON: Log "textAssist" actions." into oc-dev
...
am: fa9d889d3e
2017-04-20 16:05:43 +00:00
Clara Bayarri
18d539cd0a
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
...
am: 1ef45a8bed
2017-04-20 16:01:03 +00:00
Svetoslav Ganov
993f63270f
Merge "Address API council comments" into oc-dev am: fb4fb03cc3
...
am: 375d615b30
2017-04-20 15:28:57 +00:00
Ashutosh Joshi
43999ea643
Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev am: bf2e5bd0f9
...
am: ae1fb69407
2017-04-20 15:16:43 +00:00
Christopher Tate
a3f70c18af
Merge "Revert "Introduce PACKAGE_FIRST_ADDED broadcast"" into oc-dev am: aa6b649a35
...
am: e56d699a89
2017-04-20 15:09:39 +00:00
Martijn Coenen
1ca9b4e332
Merge "Validate incoming data properly." into oc-dev am: a0aa7c3093
...
am: 621c6019e7
2017-04-20 15:03:20 +00:00
Ian Lake
7d68da20f1
Merge "Move expensive TextClock operations to onAttach" into oc-dev am: 4f3ba1aeed
...
am: 2e342f875d
2017-04-20 14:59:35 +00:00
Selim Cinek
00511d3dfb
Merge changes Ic76d996f,Ib9eefacb,If1b63340,I399c66af into oc-dev am: 947be6bed9
...
am: c40344bf86
2017-04-20 14:57:42 +00:00
Phil Weaver
5d25f429bf
Merge "Make a11y clickable span work after node recycle" into oc-dev
2017-04-20 14:51:43 +00:00
Jesse Hall
45ff1d1ad3
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
2017-04-20 14:51:36 +00:00
Dianne Hackborn
9ab0f438e1
Merge "Fix issue #37470038 : API Review: ServiceConnection.onBindingDead()" into oc-dev am: 232ff0bdc8
...
am: 54246d5374
2017-04-20 14:44:48 +00:00
Suprabh Shukla
2fa6412a86
Merge "Package installer related changes to javadoc" into oc-dev am: 52312298b6
...
am: a2450bacdc
2017-04-20 14:37:05 +00:00
Bryce Lee
e4b6441198
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
2017-04-20 14:19:16 +00:00
Erik Kline
c9ee35581c
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79 am: 6af3dd0fc3
...
am: 3fa8908370
2017-04-20 14:02:24 +00:00
Hugo Benichi
7b8fc6ea79
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69 am: 23ee1621c7
...
am: b51307e12e
2017-04-20 13:59:32 +00:00
Jakub Pawlowski
d911bf886b
Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am: f2e6988350 am: fc99848b96 am: f3732e2fe2" into oc-dev-plus-aosp
...
am: 88522c5f5d
2017-04-20 13:56:06 +00:00
Erik Kline
372edc3b7d
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1 am: 0d1f04384f
...
am: d9bfb83d96
2017-04-20 13:52:35 +00:00
Ian Lake
dcdbd97caa
Create a valid ActivityOptions Bundle even for default animations am: b759bd3b4a
...
am: d85e60aa46
2017-04-20 13:39:13 +00:00
Ian Lake
083641c47a
Remove scale up animation for startActivity from RemoteViews am: 95b193fdca
...
am: 594f401e26
2017-04-20 13:37:42 +00:00
Chad Brubaker
696ab6b7ff
Merge "Change ANDROID_ID for Instant Apps" into oc-dev am: 904e6cad28
...
am: 97eecf8d09
2017-04-20 13:34:06 +00:00
Abodunrinwa Toki
06a53d4729
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
...
* changes:
SmartSelection Config installer.
LangId Config installer.
2017-04-20 13:30:35 +00:00
Hugo Benichi
3ff96e5dd8
resolve merge conflicts of 7bbd03be36 to oc-dev-plus-aosp
...
Conflits were:
- static import section of ConnectivityService
- code deleted in commit a038568676
2017-04-20 22:26:50 +09:00
Jeff Sharkey
3ea7c8b6d5
Merge "Flesh out more API docs." into oc-dev am: 3a427c3bd9
...
am: 750d6d12f6
2017-04-20 13:15:28 +00:00
Andrei Stingaceanu
635d9dd864
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
2017-04-20 13:14:06 +00:00
Abodunrinwa Toki
fa9d889d3e
Merge "TRON: Log "textAssist" actions." into oc-dev
2017-04-20 13:08:52 +00:00
Erik Kline
3fa8908370
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79
...
am: 6af3dd0fc3
2017-04-20 13:00:52 +00:00
Hugo Benichi
b51307e12e
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69
...
am: 23ee1621c7
2017-04-20 12:53:22 +00:00
TreeHugger Robot
1ef45a8bed
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
2017-04-20 12:52:43 +00:00
Eugene Susla
cbe10269b5
Merge "Make javadoc of companion service name more like others" into oc-dev am: 4d95e40bb3
...
am: aaa64afd83
2017-04-20 12:50:25 +00:00
Treehugger Robot
4c7a999d79
Merge "Add local-only hotspot info into tether state change broadcast"
2017-04-20 12:47:55 +00:00
Jeff Sharkey
fb303617f8
Merge "Some folks like sending null fields." into oc-dev am: 9a1967e157
...
am: 218c2135b6
2017-04-20 12:46:37 +00:00
Hugo Benichi
458f75ef69
Merge "ConnectivityManager: remove obsolete callback types"
2017-04-20 12:38:29 +00:00
TreeHugger Robot
e54a1877e9
Merge "Add more explicit documentation for install reason"
2017-04-20 12:05:49 +00:00
Andrei Stingaceanu
1b59a21c5c
AutoSize TextView - API polish - no RuntimeException in signature
...
Do not mention RuntimeException subclasses in throws clauses in
method signatures.
Bug: 37514926
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t \
android.widget.cts.TextViewTest
Change-Id: Ia5bf4cd64e12c53dd7c409b6e44efec4983ae62e
2017-04-20 12:09:11 +01:00
