Seigo Nonaka
802c41bd11
Merge "Font provider cleaning ups." into oc-dev am: 5313eee98a
...
am: a3d5786a3d
2017-04-26 00:39:15 +00:00
Eugene Susla
43371da3ad
Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
...
am: 56620feed0
2017-04-26 00:36:49 +00:00
Wale Ogunwale
2e80263ec4
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev am: 3ce611f1b4
...
am: a17d99a389
2017-04-26 00:27:56 +00:00
Seigo Nonaka
a3d5786a3d
Merge "Font provider cleaning ups." into oc-dev
...
am: 5313eee98a
2017-04-25 21:48:20 +00:00
Seigo Nonaka
5313eee98a
Merge "Font provider cleaning ups." into oc-dev
2017-04-25 21:40:42 +00:00
Eugene Susla
56620feed0
Merge "Remove underscore from Companion service name" into oc-dev
...
am: 885b5f4466
2017-04-25 21:37:40 +00:00
Jakub Pawlowski
d5b8da0f97
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8 am: 3e56fdba72 am: adc97e1c33
...
am: ba785bb0ba
2017-04-25 21:31:10 +00:00
Jakub Pawlowski
6c9192cbb9
Merge "Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef am: 36ceeb548e" into oc-dev-plus-aosp
...
am: 45ed148f6d
2017-04-25 21:27:32 +00:00
TreeHugger Robot
885b5f4466
Merge "Remove underscore from Companion service name" into oc-dev
2017-04-25 21:26:15 +00:00
Wale Ogunwale
a17d99a389
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
...
am: 3ce611f1b4
2017-04-25 21:16:00 +00:00
Phil Weaver
fb805e0fe6
Merge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334ba" into oc-dev-plus-aosp
...
am: b471a37b10
2017-04-25 21:13:19 +00:00
Jakub Pawlowski
6656ec74e2
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c68d2e am: 6260ea5ab7
...
am: 343ef5d024
2017-04-25 21:04:48 +00:00
TreeHugger Robot
3ce611f1b4
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
2017-04-25 20:58:38 +00:00
TreeHugger Robot
d3104d7bbe
Merge "Address API Council feedback."
2017-04-25 20:53:43 +00:00
Julia Reynolds
a047d8944b
Merge "Allow some notifications in a group to be muted" into oc-dev am: 9685128edf
...
am: 5bc54aad76
2017-04-25 20:47:12 +00:00
Pavel Grafov
b8349c7f11
Merge "Fix javadoc to clearly express units and base for time value." into oc-dev am: 0a001ed37f
...
am: 31f94f28d2
2017-04-25 20:42:42 +00:00
Amin Shaikh
f3024d69ec
Merge changes from topic 'experio-scoring' into oc-dev am: bad4573bd4
...
am: 592ecd0b5a
2017-04-25 20:14:37 +00:00
Felipe Leme
83e4d4bed6
Merge "Make new onFill/onSave methods abstract." into oc-dev am: 3411adc4b3
...
am: 2509121907
2017-04-25 20:12:17 +00:00
Jakub Pawlowski
ba785bb0ba
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8 am: 3e56fdba72
...
am: adc97e1c33
2017-04-25 20:06:17 +00:00
Jakub Pawlowski
701370c140
Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef
...
am: 36ceeb548e
2017-04-25 20:01:57 +00:00
Tony Wickham
d908d49526
Merge "Address API Review comments" into oc-dev am: 974cea8f4c
...
am: e90ece4635
2017-04-25 20:01:24 +00:00
Peng Xu
6d8e5f6854
Merge "sensors: fix concurrent modification exception" into oc-dev am: 9098a0260f
...
am: 90c60be02f
2017-04-25 19:57:18 +00:00
Jakub Pawlowski
adc97e1c33
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8
...
am: 3e56fdba72
2017-04-25 19:56:43 +00:00
Jakub Pawlowski
36ceeb548e
Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808
...
am: 41eae807ef
2017-04-25 19:54:54 +00:00
Android Build Merger (Role)
b471a37b10
Merge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334ba" into oc-dev-plus-aosp
2017-04-25 19:53:33 +00:00
Phil Weaver
af3255b931
Merge "Remove a11y web flags and associated settings" into oc-dev
...
am: cd68c334ba
2017-04-25 19:52:07 +00:00
Jakub Pawlowski
343ef5d024
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c68d2e
...
am: 6260ea5ab7
2017-04-25 19:51:38 +00:00
Jakub Pawlowski
6260ea5ab7
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404
...
am: 3d95c68d2e
2017-04-25 19:41:54 +00:00
Seigo Nonaka
54084b64b1
Font provider cleaning ups.
...
- Remove Columns.STYLE
- Decouple Context from Typeface.
- Make FontsContract constructor private since it is essentially static.
- Removed unused constants.
Bug: 37281200
Bug: 37268410
Test: am instrument -w -e class android.provider.FontsContractE2ETest
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.provider.FontsContractTest
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.graphics.cts.TypefaceTest
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic46c256141d27ca28f30023bcc40f4e1161d5338
2017-04-25 19:40:58 +00:00
Julia Reynolds
5bc54aad76
Merge "Allow some notifications in a group to be muted" into oc-dev
...
am: 9685128edf
2017-04-25 19:39:30 +00:00
Seigo Nonaka
94bc52b2e1
Merge "Remove Typeface.create" into oc-dev am: 0a7096dccb
...
am: 0582ccb776
2017-04-25 19:38:26 +00:00
Treehugger Robot
bdeb8539e8
Merge "Bluetooth: expand comments on new PHY constants"
2017-04-25 19:36:37 +00:00
Treehugger Robot
1f4e111808
Merge "Bluetooth: Add handler parameter to connectGatt"
2017-04-25 19:36:22 +00:00
Pavel Grafov
31f94f28d2
Merge "Fix javadoc to clearly express units and base for time value." into oc-dev
...
am: 0a001ed37f
2017-04-25 19:34:04 +00:00
Phil Weaver
cd68c334ba
Merge "Remove a11y web flags and associated settings" into oc-dev
2017-04-25 19:25:23 +00:00
Julia Reynolds
9685128edf
Merge "Allow some notifications in a group to be muted" into oc-dev
2017-04-25 19:25:05 +00:00
TreeHugger Robot
0a001ed37f
Merge "Fix javadoc to clearly express units and base for time value." into oc-dev
2017-04-25 19:17:28 +00:00
Amin Shaikh
592ecd0b5a
Merge changes from topic 'experio-scoring' into oc-dev
...
am: bad4573bd4
2017-04-25 19:07:11 +00:00
Adrian Roos
bfe43afd49
Merge "Perf: Fix RemoteViews memory leak" into oc-dev am: 4554332475
...
am: f277953d83
2017-04-25 18:54:16 +00:00
TreeHugger Robot
bad4573bd4
Merge changes from topic 'experio-scoring' into oc-dev
...
* changes:
Remove Settings.CURATE_SAVED_OPEN_NETWORKS
Remove request recommendation from AIDL files.
Remove the recommendation request impl and test code.
Deprecate the recommendation request code.
2017-04-25 18:51:51 +00:00
Wale Ogunwale
e610d3dba8
Switch ActivityRecord last reported config. to MergeConfiguration
...
Clean-up before actual fix for b/36897968 that makes the code easier to
follow.
Test: Existing tests pass
Bug: 36897968
Change-Id: I3039548929440f922dc69d7f130169a3d60b1eef
2017-04-25 11:48:43 -07:00
Felipe Leme
2509121907
Merge "Make new onFill/onSave methods abstract." into oc-dev
...
am: 3411adc4b3
2017-04-25 18:36:44 +00:00
TreeHugger Robot
3411adc4b3
Merge "Make new onFill/onSave methods abstract." into oc-dev
2017-04-25 18:31:12 +00:00
Tony Wickham
e90ece4635
Merge "Address API Review comments" into oc-dev
...
am: 974cea8f4c
2017-04-25 18:25:44 +00:00
Tony Wickham
974cea8f4c
Merge "Address API Review comments" into oc-dev
2017-04-25 18:16:55 +00:00
Peng Xu
90c60be02f
Merge "sensors: fix concurrent modification exception" into oc-dev
...
am: 9098a0260f
2017-04-25 18:01:05 +00:00
Peng Xu
9098a0260f
Merge "sensors: fix concurrent modification exception" into oc-dev
2017-04-25 17:51:26 +00:00
Jakub Pawlowski
60c7dac775
Bluetooth: expand comments on new PHY constants
...
Bug: 37544152
Test: the all-knowing eyes of the reviewers
Change-Id: I8f5a756a204fe90960700e1dc42f64824d3b844a
2017-04-25 17:46:50 +00:00
Jakub Pawlowski
e55c446977
Bluetooth: document status value in PHY read/update
...
Bug: 37544152
Test: none
Change-Id: I2bac468f833c73cd282b1dac80b6553917996604
2017-04-25 17:46:40 +00:00
Jakub Pawlowski
4eab49652e
Bluetooth: Add handler parameter to connectGatt
...
Bug: 37544152
Test: sl4a GattReadTest GattWriteTest
Change-Id: I043dfefaafe9f3700418f2c855c52aac3644310f
2017-04-25 17:46:33 +00:00
