Jean-Michel Trivi
5c77eaffd0
Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev am: ac7f215124
...
am: 17d5e9a028
Change-Id: I55e393d1abf4b2302f90945783791208e658c632
2017-04-20 17:41:51 +00:00
Bryce Lee
ee05c604f8
Merge "Merge "Deprecate Activity#requestVisibleBehind" into oc-dev am: e4b6441198" into oc-dev-plus-aosp
...
am: d0ead2aa95
Change-Id: I1883a2ce2c199b2a3169d8fde389a6d8fb880b08
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
Change-Id: If30d4f866655de89618d1afcb5560f9827691e11
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
Change-Id: I224e35a6dcb59a99500e8903f90d9b9a66a64360
2017-04-20 16:41:59 +00:00
Jean-Michel Trivi
17d5e9a028
Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev
...
am: ac7f215124
Change-Id: I9dd175f1f457293369e01ad43791622329103cd9
2017-04-20 16:41:12 +00:00
Clara Bayarri
fb164c34f2
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev am: 1ef45a8bed
...
am: 18d539cd0a
Change-Id: I1712bdf8f1cb559a657407785230eccb4dd75722
2017-04-20 16:31:49 +00:00
Bryce Lee
08cda62574
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
...
am: e4b6441198
Change-Id: Ib18fa326c6f41b8f83cd9d08043acd2b80324db1
2017-04-20 16:12:54 +00:00
Abodunrinwa Toki
d5857c4e9f
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
...
am: 06a53d4729
Change-Id: Ia739bdad9c5877f9e02efba709521fb9c9dc8795
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
Change-Id: Ic11450a566051ca63f3b65e60c70e8da4d1cef11
2017-04-20 16:07:03 +00:00
Clara Bayarri
18d539cd0a
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
...
am: 1ef45a8bed
Change-Id: Ife03fa12b508a54465a3b57f9b97ed1bb0a6c059
2017-04-20 16:01:03 +00:00
Jean-Michel Trivi
ac7f215124
Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev
2017-04-20 15:45:11 +00:00
Svetoslav Ganov
993f63270f
Merge "Address API council comments" into oc-dev am: fb4fb03cc3
...
am: 375d615b30
Change-Id: Ibba72870f4d4da53ab411b5e279a967a86584e19
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
Change-Id: Ibe4c0ed4c5cdc53a804a4e7ed8098f800e5bfb46
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
Change-Id: I5d684f3dc14130655868394b001d2960a84d1579
2017-04-20 15:09:39 +00:00
Dianne Hackborn
9ab0f438e1
Merge "Fix issue #37470038 : API Review: ServiceConnection.onBindingDead()" into oc-dev am: 232ff0bdc8
...
am: 54246d5374
Change-Id: Id414ddd56d711cf4f0e383d8e0964add4129eec0
2017-04-20 14:44:48 +00:00
Bryce Lee
e4b6441198
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
2017-04-20 14:19:16 +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
Andrei Stingaceanu
635d9dd864
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
2017-04-20 13:14:06 +00:00
TreeHugger Robot
1ef45a8bed
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
2017-04-20 12:52:43 +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
Svetoslav Ganov
375d615b30
Merge "Address API council comments" into oc-dev
...
am: fb4fb03cc3
Change-Id: I32f062c901fa3b71b5782af734b93fd8ac877d1f
2017-04-20 04:02:40 +00:00
TreeHugger Robot
fb4fb03cc3
Merge "Address API council comments" into oc-dev
2017-04-20 03:53:37 +00:00
Ashutosh Joshi
ae1fb69407
Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev
...
am: bf2e5bd0f9
Change-Id: Ib52da25c6e148ee7c1416be02aa5b78779b3dedb
2017-04-20 03:17:54 +00:00
Ashutosh Joshi
bf2e5bd0f9
Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev
2017-04-20 03:10:26 +00:00
Christopher Tate
e56d699a89
Merge "Revert "Introduce PACKAGE_FIRST_ADDED broadcast"" into oc-dev
...
am: aa6b649a35
Change-Id: Ic5d9b128ecaa52ef28d2d9d03748a3a919c64cd6
2017-04-20 02:21:40 +00:00
TreeHugger Robot
aa6b649a35
Merge "Revert "Introduce PACKAGE_FIRST_ADDED broadcast"" into oc-dev
2017-04-20 02:15:14 +00:00
George Mount
ffb489ec29
Merge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am: f3ff7b8207" into oc-dev-plus-aosp
...
am: 5c08716a58
Change-Id: I6ece7583fe6305f08eac7605d171b3d3779f3883
2017-04-20 00:10:42 +00:00
Dianne Hackborn
54246d5374
Merge "Fix issue #37470038 : API Review: ServiceConnection.onBindingDead()" into oc-dev
...
am: 232ff0bdc8
Change-Id: I71f94cd80a7734a24d51652fd3e203f47f51d171
2017-04-20 00:10:01 +00:00
Winson Chung
3ef1e1785e
Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am: d1a1c8004e" into oc-dev-plus-aosp
...
am: 90ee48b66c
Change-Id: I0cac56ba0ce274e031826e2b3f4a2de72935f384
2017-04-20 00:08:29 +00:00
TreeHugger Robot
232ff0bdc8
Merge "Fix issue #37470038 : API Review: ServiceConnection.onBindingDead()" into oc-dev
2017-04-19 23:55:40 +00:00
Sunny Goyal
89106cdbdf
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev am: 7790695bf2
...
am: fa7cc65529
Change-Id: Ic916650a42614c88dca4050078bd854c3546288a
2017-04-19 23:01:03 +00:00
Christopher Tate
94b91dbbb8
Revert "Introduce PACKAGE_FIRST_ADDED broadcast"
...
This reverts commit ee3b42af3f .
Bug 37219124
Test: manual
2017-04-19 15:49:17 -07:00
Dianne Hackborn
ac26534996
Fix issue #37470038 : API Review: ServiceConnection.onBindingDead()
...
Renamed.
Test: booted and ran.
Change-Id: Ic21f7ef66d43fb6db9f7ebbc833f28c09474ea59
2017-04-19 14:53:43 -07:00
TreeHugger Robot
92dd7193d4
Merge "Pre-merge hide API for a11y service state"
2017-04-19 21:52:07 +00:00
Abodunrinwa Toki
bb957d12ba
SmartSelection Config installer.
...
Test: none
Bug: 34780396
Change-Id: I9cb04e7b20b565ac5d128475a90bd065c805e95e
2017-04-19 21:39:41 +01:00
Abodunrinwa Toki
51c4203ab4
LangId Config installer.
...
Test: none
Bug: 34780396
Change-Id: I6cdd608ea9a41041d03640997c076c6e6fea0129
2017-04-19 21:35:07 +01:00
George Mount
defb888aac
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
...
am: f3ff7b8207
Change-Id: I447d517cba4f694896dc9319ba7b93dda4b1d01f
2017-04-19 18:53:02 +00:00
Winson Chung
161384eb6b
Merge "Adding consistent platform PiP action asset." into oc-dev
...
am: d1a1c8004e
Change-Id: Ia94a684ca81bd50dd4cb51ebb816c4ac99f24a89
2017-04-19 18:50:11 +00:00
Jean-Michel Trivi
fa97222e87
Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""
...
This reverts commit e4a9911b68 .
Change-Id: Id260024dbf926a1defc1c5302a86b694e3c7f8c9
Bug: 36724262
2017-04-19 18:37:27 +00:00
Sunny Goyal
fa7cc65529
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
...
am: 7790695bf2
Change-Id: I3520dc3c3a5cbe933894764e2d3f7ac9df11582e
2017-04-19 18:33:04 +00:00
TreeHugger Robot
f3ff7b8207
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
2017-04-19 18:15:36 +00:00
Winson Chung
d1a1c8004e
Merge "Adding consistent platform PiP action asset." into oc-dev
2017-04-19 18:10:20 +00:00
Sunny Goyal
7790695bf2
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
2017-04-19 17:10:42 +00:00
Tao Bao
5b7925d78d
Merge "RecoverySystem: Verify the package compatibility." into oc-dev am: e3872a4fc9
...
am: a9fd199fdd
Change-Id: I65c9418a651dd66f274ab6e331185731be10e8ea
2017-04-19 16:10:20 +00:00
Tao Bao
a9fd199fdd
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
...
am: e3872a4fc9
Change-Id: I120d13b68e837c6ebb60baf8d3fe3aecb495159f
2017-04-19 16:05:25 +00:00
Tao Bao
e3872a4fc9
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
2017-04-19 15:54:24 +00:00
Felipe Leme
20ab6c550d
Merge "Some Autofill API changes." into oc-dev am: fe1bddfbb5
...
am: a4d2749cf8
Change-Id: I460229f5bf0c4fc832256e00746a813fd08991ea
2017-04-19 05:18:57 +00:00
Felipe Leme
a4d2749cf8
Merge "Some Autofill API changes." into oc-dev
...
am: fe1bddfbb5
Change-Id: I682065cd5fcfb2de9639874705fefdeaed06d343
2017-04-19 05:13:19 +00:00
Felipe Leme
fe1bddfbb5
Merge "Some Autofill API changes." into oc-dev
2017-04-19 05:05:48 +00:00