George Mount
d11fa9b032
Merge "Kill running animations on fragment view's when removed." into oc-dev
...
am: dcc7feb329
2017-04-21 00:06:58 +00:00
George Mount
f8b8000261
Merge "Execute pending transactions after FM state change." into oc-dev
...
am: d58d802c5f
2017-04-20 23:57:22 +00:00
TreeHugger Robot
dcc7feb329
Merge "Kill running animations on fragment view's when removed." into oc-dev
2017-04-20 23:52:48 +00:00
TreeHugger Robot
d58d802c5f
Merge "Execute pending transactions after FM state change." into oc-dev
2017-04-20 23:51:07 +00:00
Felipe Leme
9cc391bacf
Merge "Added missing important-for-autofill mappings." into oc-dev
...
am: b8305e9186
2017-04-20 23:47:48 +00:00
TreeHugger Robot
b8305e9186
Merge "Added missing important-for-autofill mappings." into oc-dev
2017-04-20 23:43:38 +00:00
George Mount
01c9ed8b7e
Merge "fix NPE when fragment container is null" into oc-dev
...
am: 38eae1bb15
2017-04-20 20:47:51 +00:00
George Mount
38eae1bb15
Merge "fix NPE when fragment container is null" into oc-dev
2017-04-20 20:38:10 +00:00
Makoto Onuki
be699f8a36
Merge "Enhance the shortcut manager javadoc." into oc-dev
...
am: aeb7505a7f
2017-04-20 20:23:47 +00:00
George Mount
416b377759
fix NPE when fragment container is null
...
Bug 37529822
Test: ran against breaking application
Change-Id: Ib829b817eddf2e91898989a2f9e7885a6f5847e5
2017-04-20 13:17:30 -07:00
Makoto Onuki
aeb7505a7f
Merge "Enhance the shortcut manager javadoc." into oc-dev
2017-04-20 20:14:27 +00:00
Chad Brubaker
46f7f1c245
Merge "Address API review comments for registerReceiver" into oc-dev
...
am: 1f4e053aef
2017-04-20 19:59:51 +00:00
Chad Brubaker
1f4e053aef
Merge "Address API review comments for registerReceiver" into oc-dev
2017-04-20 19:52:51 +00:00
Seigo Nonaka
785738c2fc
Merge "Stop fetching font data if the context is restricted." into oc-dev
...
am: 4e45b1491a
2017-04-20 19:06:51 +00:00
TreeHugger Robot
4e45b1491a
Merge "Stop fetching font data if the context is restricted." into oc-dev
2017-04-20 18:56:46 +00:00
Makoto Onuki
16e83d0536
Enhance the shortcut manager javadoc.
...
Test: make -j offline-sdk-docs
Bug 37418396
Change-Id: Ic82eb45ea232c2f032abaade12ac9ca967c35cae
2017-04-20 11:22:59 -07:00
Eugene Susla
7e765db26f
Merge "StopScan before each new Companion device scan" into oc-dev
...
am: 611797073f
2017-04-20 17:57:40 +00:00
Eugene Susla
611797073f
Merge "StopScan before each new Companion device scan" into oc-dev
2017-04-20 17:51:00 +00:00
Felipe Leme
2d0eb5e33c
Merge "Moved getAutofillOptions() logic from SpinnerAbs to AdapterView and Adapter." into oc-dev
...
am: f4af35a5fe
2017-04-20 17:36:31 +00:00
TreeHugger Robot
f4af35a5fe
Merge "Moved getAutofillOptions() logic from SpinnerAbs to AdapterView and Adapter." into oc-dev
2017-04-20 17:25:19 +00:00
Sudheer Shanka
6c7d88c62c
Merge "Revert "Add new api Activity.getStartInitiatedTime."" into oc-dev
...
am: 8f40881e3e
2017-04-20 17:01:24 +00:00
Sudheer Shanka
8f40881e3e
Merge "Revert "Add new api Activity.getStartInitiatedTime."" into oc-dev
2017-04-20 16:32:37 +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
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
Felipe Leme
5a791c8584
Added missing important-for-autofill mappings.
...
Bug: 36171235
Test: m update-api
Change-Id: I7bbbe7a323110c89976cab3e4f5c8f4acba407d7
2017-04-20 08:26:14 -07: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
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
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
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
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
Treehugger Robot
4c7a999d79
Merge "Add local-only hotspot info into tether state change broadcast"
2017-04-20 12:47:55 +00:00
Hugo Benichi
458f75ef69
Merge "ConnectivityManager: remove obsolete callback types"
2017-04-20 12:38:29 +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
Clara Bayarri
7fea2e264e
Api Council: hide FontsContract.Columns constructor
...
Bug: 37515256
Test: none
Change-Id: I2a9de7ea30ffa39af5104977f6604ce3bda220fb
2017-04-20 11:56:09 +01:00
Erik Kline
8351faa900
Add local-only hotspot info into tether state change broadcast
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
2017-04-20 19:44:01 +09:00
Erik Kline
d9bfb83d96
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1
...
am: 0d1f04384f
2017-04-20 04:47:16 +00:00
Hugo Benichi
7bbd03be36
Merge "ConnectivityManager: unify prety printing of callback types." am: 0a4dc6a5d2
...
am: 3a0e92fada
2017-04-20 04:40:34 +00:00
