Makoto Onuki
0b2108e7f7
Merge "Enhance PinItemRequest javadoc" into oc-dev am: 5838563e93
...
am: deda224f14
Change-Id: Ib62d8fc270656df7e74a534645478fc78214ee6b
2017-04-17 22:19:05 +00:00
Philip P. Moltmann
955b263deb
Merge "Allow to finish session when all views are gone" into oc-dev am: 3440e92009
...
am: 88a9bd73bb
Change-Id: I90aa430b7bcb5494804abc3960273c32b1c1bf81
2017-04-17 22:10:49 +00:00
Makoto Onuki
901eac61e5
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev am: c3fa6ab2ac
...
am: 9381a4542d
Change-Id: I0d8ffd125fdec072e4345cd109a1d71969cea952
2017-04-17 21:55:53 +00:00
Aurimas Liutikas
9c33e6e3f4
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev am: ff4e132cff
...
am: a49fb70e5f
Change-Id: Idf8a195e9abfa74289f6c6978382fad62f93d87b
2017-04-17 21:54:36 +00:00
Chien-Yu Chen
753bb4ce84
Merge "Camera: Override enableZsl based on SDK version" into oc-dev am: 3b41407f19
...
am: e92d62ac89
Change-Id: Ia748c7848e6feedd87294475093837b43c3cc55e
2017-04-17 21:50:01 +00:00
Joe LaPenna
21b9a64a2c
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev am: 5b06dbd12b
...
am: feb382e926
Change-Id: I96de8a97ca2825ffa02cfce474025bc43b3c3331
2017-04-17 21:48:18 +00:00
Selim Cinek
79606abc48
Merge changes I22b55b73,Id050f2f5 into oc-dev am: d8d7a283bd
...
am: 324b399798
Change-Id: I1b8d5eb716a80f26370e3e46d587a9a4922c343e
2017-04-17 21:45:43 +00:00
Makoto Onuki
deda224f14
Merge "Enhance PinItemRequest javadoc" into oc-dev
...
am: 5838563e93
Change-Id: Ie0233a300fe9dc046117602a891679e5f1b00a98
2017-04-17 21:03:32 +00:00
Philip P. Moltmann
88a9bd73bb
Merge "Allow to finish session when all views are gone" into oc-dev
...
am: 3440e92009
Change-Id: I5adf95ccd456818f3858e7c2ee194d126be57f1f
2017-04-17 21:00:28 +00:00
Makoto Onuki
5838563e93
Merge "Enhance PinItemRequest javadoc" into oc-dev
2017-04-17 20:50:44 +00:00
Makoto Onuki
9381a4542d
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
...
am: c3fa6ab2ac
Change-Id: Ie67b77c8873b237a82e9ec470e3fcb698d474e3e
2017-04-17 20:46:36 +00:00
TreeHugger Robot
3440e92009
Merge "Allow to finish session when all views are gone" into oc-dev
2017-04-17 20:45:05 +00:00
TreeHugger Robot
c3fa6ab2ac
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
2017-04-17 20:36:00 +00:00
Aurimas Liutikas
a49fb70e5f
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
...
am: ff4e132cff
Change-Id: I72249172933a83c91c175dd46c96823368a25bda
2017-04-17 20:21:25 +00:00
TreeHugger Robot
ff4e132cff
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
2017-04-17 20:15:22 +00:00
Chien-Yu Chen
e92d62ac89
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
...
am: 3b41407f19
Change-Id: I8399759e0ba6cf31aaa7fb2330272522b6abdf5c
2017-04-17 19:58:03 +00:00
TreeHugger Robot
3b41407f19
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
2017-04-17 19:49:12 +00:00
TreeHugger Robot
8e3b1a63f9
Merge "EUICC API changes to support error resolution."
2017-04-17 19:22:49 +00:00
Joe LaPenna
feb382e926
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
...
am: 5b06dbd12b
Change-Id: I29bf802473cd98352390a12120d2bbd9b293f5cf
2017-04-17 19:08:19 +00:00
TreeHugger Robot
5b06dbd12b
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
2017-04-17 19:03:03 +00:00
Selim Cinek
324b399798
Merge changes I22b55b73,Id050f2f5 into oc-dev
...
am: d8d7a283bd
Change-Id: Ia147e09d7974c2a4f810ee0df04c602be1760be4
2017-04-17 19:00:28 +00:00
TreeHugger Robot
d8d7a283bd
Merge changes I22b55b73,Id050f2f5 into oc-dev
...
* changes:
Only foreground service notifications can be colorized
Fixed a regression where the scrim would be black
2017-04-17 18:51:07 +00:00
Andrii Kulian
058e1908b2
Merge "Temporary remove resource-display caching" into oc-dev am: 8f4bd67929
...
am: 8063101678
Change-Id: I1ca01d912880b629b67a25a2a03e257f35a83400
2017-04-17 17:17:19 +00:00
Andrii Kulian
8063101678
Merge "Temporary remove resource-display caching" into oc-dev
...
am: 8f4bd67929
Change-Id: I26ead23b26bd5ed50804cb5edf0ca15d10303eb5
2017-04-17 17:08:29 +00:00
Andrii Kulian
8f4bd67929
Merge "Temporary remove resource-display caching" into oc-dev
2017-04-17 17:00:06 +00:00
Andrii Kulian
cff2f814a8
Temporary remove resource-display caching
...
An instance of ResourceKey may correspond to different instances
of Resources at different points in time. This can lead to old
instances of Display returned from cache even if resources have
changed.
We need to ensure 1:1 correspondence between Resources and
ResourceKey before using this kind of cache. Disabling it for now
to fix CTS.
Change-Id: Ib53550c4f2d969c06a570ab6051529269b04b38d
Fixes: 37328072
Fixes: 37305567
Bug: 33430498
Test: android.server.cts.ActivityManagerAppConfigurationTests
Test: android.app.cts.DisplayTest#testRotation
2017-04-17 16:56:55 +00:00
Julia Reynolds
1ab0f123bb
Merge "Also use the notification's sound for the misc channel" into oc-dev am: ed8f49efdc
...
am: f6ca4cfcd2
Change-Id: I195ac4a4006cfc746b784f4f99d6fe42c93e40af
2017-04-17 16:42:07 +00:00
Julia Reynolds
f6ca4cfcd2
Merge "Also use the notification's sound for the misc channel" into oc-dev
...
am: ed8f49efdc
Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8
2017-04-17 16:33:11 +00:00
Aurimas Liutikas
ba590a694b
Enhance Chronometer to better support Swedish countdowns.
...
Adds a method isTheFinalCountDown that allows to correctly
determine whether it is the final countdown.
Test: None
Change-Id: I786ae3455479bac25ccf25efba1c3dce18185117
2017-04-17 09:27:09 -07:00
TreeHugger Robot
ed8f49efdc
Merge "Also use the notification's sound for the misc channel" into oc-dev
2017-04-17 16:23:55 +00:00
Julia Reynolds
39e00e1203
Merge "Remove @removed method" into oc-dev am: bbcf5fba1c
...
am: 211d99d1b9
Change-Id: I9400d1f49af2e35771d402f2879c85e29e4604f0
2017-04-17 15:17:48 +00:00
Julia Reynolds
211d99d1b9
Merge "Remove @removed method" into oc-dev
...
am: bbcf5fba1c
Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6
2017-04-17 15:09:24 +00:00
TreeHugger Robot
bbcf5fba1c
Merge "Remove @removed method" into oc-dev
2017-04-17 15:01:54 +00:00
Julia Reynolds
b9e712ebde
Also use the notification's sound for the misc channel
...
Even if it's nonexistent.
Test: runtest systemui-notification
Change-Id: I1167fdf10b776460de696657dd49ab6f2be85753
Fixes: 37414045
2017-04-17 14:33:30 +00:00
Todd Kennedy
56f715160e
Merge "expose the instant app installer component" into oc-dev am: 676590d060
...
am: 8d0dacb5b1
Change-Id: Id1df099740c6e108878c8f10aacceb59b42b0041
2017-04-17 14:32:38 +00:00
Todd Kennedy
8d0dacb5b1
Merge "expose the instant app installer component" into oc-dev
...
am: 676590d060
Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744
2017-04-17 14:22:35 +00:00
TreeHugger Robot
676590d060
Merge "expose the instant app installer component" into oc-dev
2017-04-17 14:17:27 +00:00
Philip P. Moltmann
494c3f5da2
Allow to finish session when all views are gone
...
An service can option to finish the session once all views that it
declared as important. Views that are important are all autofillable
views of any partition and the saveable fields of the last partition.
Test: CtsAutoFillServiceTestCases
Fixes: 35708237
Change-Id: I0ccade8ebb427e5d8928697ef0007c75d3f83df0
2017-04-16 21:36:25 -07:00
Hugo Benichi
919f128a16
ConnectivityManager: unify prety printing of callback types.
...
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
2017-04-17 08:50:58 +09:00
Stephen Chen
4c36c8a381
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev am: e587591c5a
...
am: 45a1fa12c0
Change-Id: Ibade5d0264b49cc2e3a5f28af4d520ebff5b0c40
2017-04-15 09:17:51 +00:00
Stephen Chen
45a1fa12c0
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
...
am: e587591c5a
Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f
2017-04-15 09:13:41 +00:00
TreeHugger Robot
e587591c5a
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
2017-04-15 09:04:35 +00:00
Jorim Jaggi
626eb77c16
Merge "Wallpaper color extraction API stub" into oc-dev am: 6acf7a7b45
...
am: 9b24dd3186
Change-Id: Iae905316d4a489de425d0dd8da1b0cf35c559f82
2017-04-15 05:02:07 +00:00
Jorim Jaggi
9b24dd3186
Merge "Wallpaper color extraction API stub" into oc-dev
...
am: 6acf7a7b45
Change-Id: I6d4e70f45b60fc76e017a982f70a2a7b14b3a3a9
2017-04-15 04:56:51 +00:00
Jorim Jaggi
6acf7a7b45
Merge "Wallpaper color extraction API stub" into oc-dev
2017-04-15 04:52:24 +00:00
Eugene Susla
1c6b5765bb
Merge "API for notification listener for Companioon apps" into oc-dev am: 0d88904744
...
am: 0fb1104b25
Change-Id: I33326544bd1eef9abc900ea13cb2fdf32ad06cbe
2017-04-15 04:28:02 +00:00
Eugene Susla
0fb1104b25
Merge "API for notification listener for Companioon apps" into oc-dev
...
am: 0d88904744
Change-Id: Ie6093be3e7699481473eeb597bc4d604728330a2
2017-04-15 04:22:48 +00:00
TreeHugger Robot
0d88904744
Merge "API for notification listener for Companioon apps" into oc-dev
2017-04-15 04:15:38 +00:00
Svetoslav Ganov
6359d85658
Merge "Add support for multiple fill contexts" into oc-dev am: 41200eac71
...
am: 721b28f029
Change-Id: I1e3da29514943c1e7476db8bc6a1cbba46b7a116
2017-04-15 03:37:56 +00:00
Svetoslav Ganov
721b28f029
Merge "Add support for multiple fill contexts" into oc-dev
...
am: 41200eac71
Change-Id: I9a66bc2d97efbc19fd0cbfd57dfb13323e3ab31a
2017-04-15 03:33:02 +00:00