OSDN Git Service
Winson Chung [Tue, 18 Apr 2017 02:09:47 +0000 (02:09 +0000)]
Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev am:
c2627353c4
am:
302c49a559
Change-Id: Ie6e2713060cd58fc14eab62d8b7b059b9585b98d
Adrian Roos [Tue, 18 Apr 2017 02:08:28 +0000 (02:08 +0000)]
Merge "AppErrors: Add test for AppErrorDialog.onCreate" into oc-dev am:
d7852f4363
am:
56af059ac6
Change-Id: Ie24a4ddd8c90c585bf24a8e2491f02187a5d6e43
Yifan Hong [Tue, 18 Apr 2017 02:06:26 +0000 (02:06 +0000)]
Merge changes from topic 'vintf_check_compat_native' am:
6d033475b3 am:
4fccec4f81 am:
ee93d9da20
am:
f06e0479fb
Change-Id: I63676092d99fad6aa9abcf504b88f2cb83f45afe
jiabin [Tue, 18 Apr 2017 02:04:51 +0000 (02:04 +0000)]
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev am:
4fba6e62a1
am:
02b100c62b
Change-Id: I470c233f8ebe88b0f47e669d534820e0f6e88bbd
Julia Reynolds [Tue, 18 Apr 2017 02:02:52 +0000 (02:02 +0000)]
Merge "Notification settings can contain dashboard settings" into oc-dev am:
38323f50c7
am:
47101fc1b0
Change-Id: Ibf18f775e0600044519bdf4af7a5d17d8e7ad299
Chris Craik [Tue, 18 Apr 2017 02:01:41 +0000 (02:01 +0000)]
Merge "Disable crashing drop shadow tests" into oc-dev am:
9d67b50308
am:
9c66ae77a0
Change-Id: I2bc2fdd8c6921dda826b35244fe880e8301b11a2
Geoffrey Pitsch [Tue, 18 Apr 2017 01:59:52 +0000 (01:59 +0000)]
Merge "Accessibility for Notification Inline Controls" into oc-dev am:
8c3a371bf3
am:
dcceca2341
Change-Id: I65df8c670dccb50b023bdce64f4705d8b4814dab
Geoffrey Pitsch [Tue, 18 Apr 2017 01:58:43 +0000 (01:58 +0000)]
Merge "Warning if app targeting O posts a notification with no channel" into oc-dev am:
dc2dd6ed9b
am:
8f6784bbaf
Change-Id: Ie2d699cef8723166cbaf4b9bb0851b7ee0f2773c
TreeHugger Robot [Tue, 18 Apr 2017 01:54:52 +0000 (01:54 +0000)]
Merge "resolve merge conflicts of
5e511e588d49 to master"
TreeHugger Robot [Tue, 18 Apr 2017 00:39:17 +0000 (00:39 +0000)]
Merge "SoundTriggerHelper: Remove unused models onLoad"
Jason Monk [Tue, 18 Apr 2017 00:08:25 +0000 (20:08 -0400)]
resolve merge conflicts of
5e511e588d49 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I00afe80d65d03a3e2d6cf85c43d6c528fb2c137a
Winson Chung [Tue, 18 Apr 2017 00:01:44 +0000 (00:01 +0000)]
Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev
am:
c2627353c4
Change-Id: I867999bac435926e9f54fb33e489ea3f44d1dad0
Jason Monk [Tue, 18 Apr 2017 00:01:40 +0000 (00:01 +0000)]
Merge "Status bar updates" into oc-dev am:
c5e04dbfd4
am:
5efe531874
Change-Id: If91d9bd5aa69ba752cafaafbea9330754492ebe8
Jeff Sharkey [Mon, 17 Apr 2017 23:57:40 +0000 (23:57 +0000)]
Merge "Storage API polishing." into oc-dev am:
200d72d933
am:
aead06b971
Change-Id: I13baad3e589cfe6b1ee257fa13742394cdee3c51
Adrian Roos [Mon, 17 Apr 2017 23:56:16 +0000 (23:56 +0000)]
Merge "AOD: Track missed AOD time ticks" into oc-dev am:
e7b581bca9
am:
5ed5068b07
Change-Id: I61842088994ceb5137f4e773eca77991132590b4
Jason Monk [Mon, 17 Apr 2017 23:55:00 +0000 (23:55 +0000)]
Merge "Fix date going missing in QS" into oc-dev am:
ff9a2790b7
am:
256a7f3926
Change-Id: If7ed5ed0e153a0887a148fbb28274c7443e1a34f
Jesse Hall [Mon, 17 Apr 2017 23:53:06 +0000 (23:53 +0000)]
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev am:
16338a4450
am:
6ad1bdb9b2
Change-Id: Ib3406dff67eb3bb872fc21e9ccf97ab48b02838d
Mike Tsao [Mon, 17 Apr 2017 23:51:43 +0000 (23:51 +0000)]
Merge "Add tests for ag/
2086796" into oc-dev am:
7c31e7924c
am:
6c9c14e745 -s ours
Change-Id: Icf85cb5976c7adcb8fe6f2b84e0ab65bc1754e22
TreeHugger Robot [Mon, 17 Apr 2017 23:50:22 +0000 (23:50 +0000)]
Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 23:49:08 +0000 (23:49 +0000)]
Merge "AppErrors: Add test for AppErrorDialog.onCreate" into oc-dev
am:
d7852f4363
Change-Id: Ic2587aa8da9d671b21c7292cd286dea011fd2503
TreeHugger Robot [Mon, 17 Apr 2017 23:41:33 +0000 (23:41 +0000)]
Merge "AppErrors: Add test for AppErrorDialog.onCreate" into oc-dev
Yifan Hong [Mon, 17 Apr 2017 23:34:32 +0000 (23:34 +0000)]
Merge changes from topic 'vintf_check_compat_native' am:
6d033475b3 am:
4fccec4f81
am:
ee93d9da20
Change-Id: Ic87e260af781cccd8af1c04cc95419c42484ca90
jiabin [Mon, 17 Apr 2017 23:30:01 +0000 (23:30 +0000)]
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev
am:
4fba6e62a1
Change-Id: I1734b0d1e3a4f02bc19120e68c161decdef24081
TreeHugger Robot [Mon, 17 Apr 2017 23:25:20 +0000 (23:25 +0000)]
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 23:24:43 +0000 (23:24 +0000)]
Merge "Notification settings can contain dashboard settings" into oc-dev
am:
38323f50c7
Change-Id: Id08a627ea7baf128667ad861481bc6d9c712929f
TreeHugger Robot [Mon, 17 Apr 2017 23:16:31 +0000 (23:16 +0000)]
Merge "Notification settings can contain dashboard settings" into oc-dev
Chris Craik [Mon, 17 Apr 2017 23:16:22 +0000 (23:16 +0000)]
Merge "Disable crashing drop shadow tests" into oc-dev
am:
9d67b50308
Change-Id: I4092a41511abcc8652bd4e482ee8c81738c1e009
Geoffrey Pitsch [Mon, 17 Apr 2017 23:15:01 +0000 (23:15 +0000)]
Merge "Accessibility for Notification Inline Controls" into oc-dev
am:
8c3a371bf3
Change-Id: I301f09565598eb80cddf107094a7fb3cd8c0b81b
TreeHugger Robot [Mon, 17 Apr 2017 23:11:09 +0000 (23:11 +0000)]
Merge "Disable crashing drop shadow tests" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 23:07:49 +0000 (23:07 +0000)]
Merge "Accessibility for Notification Inline Controls" into oc-dev
Geoffrey Pitsch [Mon, 17 Apr 2017 23:05:32 +0000 (23:05 +0000)]
Merge "Warning if app targeting O posts a notification with no channel" into oc-dev
am:
dc2dd6ed9b
Change-Id: I079da56d40214d3c5807e7f2165ab0c97d4c397d
Geoffrey Pitsch [Mon, 17 Apr 2017 22:59:01 +0000 (22:59 +0000)]
Merge "Warning if app targeting O posts a notification with no channel" into oc-dev
Jason Monk [Mon, 17 Apr 2017 22:50:33 +0000 (22:50 +0000)]
Merge "Fix up color issues as a result of theme change" into oc-dev
am:
8604ac3af5
Change-Id: Id3ac0f5131c9680d38c9d4b83904a47626785bea
Jason Monk [Mon, 17 Apr 2017 22:49:05 +0000 (22:49 +0000)]
Merge "Status bar updates" into oc-dev
am:
c5e04dbfd4
Change-Id: I34324fbaddc90814bc4efdd2d723c4b7264d284a
Jeff Sharkey [Mon, 17 Apr 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Storage API polishing." into oc-dev
am:
200d72d933
Change-Id: I1ad134599ee095628dcc7fe1da28bda40a1863f4
Jason Monk [Mon, 17 Apr 2017 22:32:49 +0000 (22:32 +0000)]
Merge "Fix up color issues as a result of theme change" into oc-dev
Jason Monk [Mon, 17 Apr 2017 22:32:09 +0000 (22:32 +0000)]
Merge "Status bar updates" into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 22:27:58 +0000 (22:27 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev am:
1ed2771450
am:
c04cb25cdb
Change-Id: Ic73c2271e9a764a032392c71a6cf46839e2c06e0
Adrian Roos [Mon, 17 Apr 2017 22:27:47 +0000 (22:27 +0000)]
Merge "AOD: Track missed AOD time ticks" into oc-dev
am:
e7b581bca9
Change-Id: I72825244a16f4d88e8acd1e69e045859ef3a8acc
Winson Chung [Mon, 17 Apr 2017 22:26:52 +0000 (22:26 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev am:
11139e913c
am:
7e60dac6cb
Change-Id: I599f62dbb9c17e3cdb79ea2363d6e162260793da
Jeff Sharkey [Mon, 17 Apr 2017 22:26:35 +0000 (22:26 +0000)]
Merge "Storage API polishing." into oc-dev
Jason Monk [Mon, 17 Apr 2017 22:26:20 +0000 (22:26 +0000)]
Merge "Fix date going missing in QS" into oc-dev
am:
ff9a2790b7
Change-Id: I88a31aad238ec5ca67b816cb6deb4e5f311536e1
Todd Lee [Mon, 17 Apr 2017 22:25:20 +0000 (22:25 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev am:
c025ea892e
am:
4dbe8216ac
Change-Id: I32dd4c3c11116acb164578b8de2ad66f36c46430
Makoto Onuki [Mon, 17 Apr 2017 22:19:05 +0000 (22:19 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev am:
5838563e93
am:
deda224f14
Change-Id: Ib62d8fc270656df7e74a534645478fc78214ee6b
TreeHugger Robot [Mon, 17 Apr 2017 22:16:16 +0000 (22:16 +0000)]
Merge "AOD: Track missed AOD time ticks" into oc-dev
Philip P. Moltmann [Mon, 17 Apr 2017 22:10:49 +0000 (22:10 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev am:
3440e92009
am:
88a9bd73bb
Change-Id: I90aa430b7bcb5494804abc3960273c32b1c1bf81
TreeHugger Robot [Mon, 17 Apr 2017 22:06:05 +0000 (22:06 +0000)]
Merge "Fix date going missing in QS" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 22:04:52 +0000 (22:04 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev am:
1c4c981c03
am:
1eb27d06c5
Change-Id: I75bac43421227497d68e5e28790c256f86624421
Jordan Liu [Mon, 17 Apr 2017 21:59:10 +0000 (21:59 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev am:
728fbfb7c1
am:
f63d979045 -s ours
Change-Id: Iffb58ee0b43552e8c60396872174377c2d1ed4f0
Makoto Onuki [Mon, 17 Apr 2017 21:55:53 +0000 (21:55 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev am:
c3fa6ab2ac
am:
9381a4542d
Change-Id: I0d8ffd125fdec072e4345cd109a1d71969cea952
Jesse Hall [Mon, 17 Apr 2017 21:55:21 +0000 (21:55 +0000)]
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
am:
16338a4450
Change-Id: I1a9ee4e54834e340eef6216e55bae7c6aaba0f73
Adrian Roos [Mon, 17 Apr 2017 21:50:22 +0000 (14:50 -0700)]
AppErrors: Add test for AppErrorDialog.onCreate
Also refactor to make sure we always remove the TIMEOUT
message and clear the mProc.mCrashDialog field, even when
dismissing without the Handler.
Bug:
37351370
Test: runtest -c com.android.server.am.AppErrorDialogTest frameworks-services
Change-Id: If9fb348e8ed83c6c1c0f48fa7fd27ffd33b530f2
Aurimas Liutikas [Mon, 17 Apr 2017 21:54:36 +0000 (21:54 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev am:
ff4e132cff
am:
a49fb70e5f
Change-Id: Idf8a195e9abfa74289f6c6978382fad62f93d87b
Jesse Hall [Mon, 17 Apr 2017 21:52:20 +0000 (21:52 +0000)]
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
Mike Tsao [Mon, 17 Apr 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Add tests for ag/
2086796" into oc-dev
am:
7c31e7924c
Change-Id: Ibe9266f7aa1f378a9e1868c927e3f28e2e2cb090
Chien-Yu Chen [Mon, 17 Apr 2017 21:50:01 +0000 (21:50 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev am:
3b41407f19
am:
e92d62ac89
Change-Id: Ia748c7848e6feedd87294475093837b43c3cc55e
Winson Chung [Tue, 11 Apr 2017 20:31:44 +0000 (13:31 -0700)]
Tightening up rotation behavior for PIP (3/3)
- Fixing up edge case when SysUI resizing conflicts with updating the
display rotation bounds. When an interaction causes both a display
rotation and a resize from SystemUI, we should defer the resize animation
until the rotation has been propagated to SystemUI, otherwise the bounds
used will be incorrect.
Bug:
36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ife1b7ab0c2f1f11f33cbc9614778ff49a28c79f6
Joe LaPenna [Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev am:
5b06dbd12b
am:
feb382e926
Change-Id: I96de8a97ca2825ffa02cfce474025bc43b3c3331
Brian Duddie [Mon, 17 Apr 2017 21:46:51 +0000 (21:46 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev am:
befd33975c
am:
2f23a1a7a1
Change-Id: I3392ad2be1113bf69381e0c7f108bb9ca1a59492
Mike Tsao [Mon, 17 Apr 2017 21:46:32 +0000 (21:46 +0000)]
Merge "Add tests for ag/
2086796" into oc-dev
Selim Cinek [Mon, 17 Apr 2017 21:45:43 +0000 (21:45 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev am:
d8d7a283bd
am:
324b399798
Change-Id: I1b8d5eb716a80f26370e3e46d587a9a4922c343e
Adrian Roos [Mon, 17 Apr 2017 21:44:31 +0000 (21:44 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev am:
f0111ce8b6
am:
7b9bff257b
Change-Id: Ib2fdd178c0de90221a460cd1839de56ff02ed1dc
Dianne Hackborn [Mon, 17 Apr 2017 21:43:16 +0000 (21:43 +0000)]
Merge "Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev am:
e15f91276c" into oc-dev-plus-aosp
am:
7c024fd5eb -s ours
Change-Id: I71e3341621ef9b07dce887d8cea99bd55b16f9b9
Jordan Liu [Mon, 17 Apr 2017 21:41:01 +0000 (21:41 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d am:
ea4a67ddd1 am:
56a13d1bce
am:
e08f67f2ad -s ours
Change-Id: Ia45e9c4a001f1de182e60970791919c1014431a2
Julia Reynolds [Mon, 17 Apr 2017 21:40:09 +0000 (21:40 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev
am:
1ed2771450
Change-Id: I3ff8b4f15fe7b3d22ef243e3f5379dd3d136a0f7
Fan Zhang [Mon, 17 Apr 2017 21:37:16 +0000 (21:37 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev am:
46f6e69e1b
am:
215cc7914e
Change-Id: I1dc55a1529803cd2b4c930c79fd110051b5b3a8c
TreeHugger Robot [Mon, 17 Apr 2017 21:35:17 +0000 (21:35 +0000)]
Merge "resolve merge conflicts of
2439e19d4127 to master"
Julia Reynolds [Mon, 17 Apr 2017 21:24:07 +0000 (17:24 -0400)]
Notification settings can contain dashboard settings
Bug:
36562211
Test: NotificationSettingsTests, RunSettingsRoboTests
Change-Id: I4da338a90e0f094202bae73f9bd8622b37a3acf6
TreeHugger Robot [Mon, 17 Apr 2017 21:26:49 +0000 (21:26 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev
Winson Chung [Mon, 17 Apr 2017 21:14:14 +0000 (21:14 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev
am:
11139e913c
Change-Id: I9b8d45c33bf3e83e7c25f5bafc2f7d90be9d875c
Todd Lee [Mon, 17 Apr 2017 21:12:59 +0000 (21:12 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
am:
c025ea892e
Change-Id: Ifb690a1ac7d9ff2605c88bd4503e06311ef0dd1c
Winson Chung [Mon, 17 Apr 2017 21:06:29 +0000 (21:06 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev
Geoffrey Pitsch [Thu, 6 Apr 2017 13:52:11 +0000 (09:52 -0400)]
Accessibility for Notification Inline Controls
Send WINDOW_STATE_CHANGED event in status bar
Disable falsing when in touch navigation
Accessibility string for enable/disable switch
Bug:
34840327
Test: runtest systemui
Change-Id: I60cc7e49d9e6323e23a17183b8b10c9d857501bb
Makoto Onuki [Mon, 17 Apr 2017 21:03:32 +0000 (21:03 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev
am:
5838563e93
Change-Id: Ie0233a300fe9dc046117602a891679e5f1b00a98
TreeHugger Robot [Mon, 17 Apr 2017 21:02:43 +0000 (21:02 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
Philip P. Moltmann [Mon, 17 Apr 2017 21:00:28 +0000 (21:00 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev
am:
3440e92009
Change-Id: I5adf95ccd456818f3858e7c2ee194d126be57f1f
Qingxi Li [Mon, 17 Apr 2017 20:59:06 +0000 (20:59 +0000)]
Merge "Add disable carrier button for eSIM"
Adrian Roos [Mon, 17 Apr 2017 20:58:41 +0000 (20:58 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev
am:
1c4c981c03
Change-Id: Icf289127886daf7eccd383aef18bd155f0d3ec67
Chris Craik [Mon, 17 Apr 2017 20:58:21 +0000 (13:58 -0700)]
Disable crashing drop shadow tests
Bug:
36272398
Test: HWUI unit tests now run without crashing
Change-Id: I2877ed184640e5043d33b10605db71dde501fd2a
Jordan Liu [Mon, 17 Apr 2017 20:56:45 +0000 (20:56 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev
am:
728fbfb7c1
Change-Id: I0b61681780b9337b5b6e36b1aadc23c52199ea08
Makoto Onuki [Mon, 17 Apr 2017 20:50:38 +0000 (20:50 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev
Makoto Onuki [Mon, 17 Apr 2017 20:46:36 +0000 (20:46 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
am:
c3fa6ab2ac
Change-Id: Ie67b77c8873b237a82e9ec470e3fcb698d474e3e
TreeHugger Robot [Mon, 17 Apr 2017 20:44:57 +0000 (20:44 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:41:02 +0000 (20:41 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 20:37:25 +0000 (20:37 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:35:55 +0000 (20:35 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
Aurimas Liutikas [Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
am:
ff4e132cff
Change-Id: I72249172933a83c91c175dd46c96823368a25bda
TreeHugger Robot [Mon, 17 Apr 2017 20:15:16 +0000 (20:15 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
Jason Monk [Mon, 17 Apr 2017 20:04:30 +0000 (16:04 -0400)]
Fix up color issues as a result of theme change
Test: visual
Change-Id: I9adc8b85b40e3ac2df6099655c7479c74675b7bb
Fixes:
37372025
Fixes:
37362926
Fixes:
37358881
Fixes:
37326340
Chien-Yu Chen [Mon, 17 Apr 2017 19:58:03 +0000 (19:58 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
am:
3b41407f19
Change-Id: I8399759e0ba6cf31aaa7fb2330272522b6abdf5c
TreeHugger Robot [Mon, 17 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
Mike Tsao [Tue, 11 Apr 2017 20:57:31 +0000 (13:57 -0700)]
Add tests for ag/
2086796
Fixes:
37192695
Change-Id: Id0b3cbf986490d64cdc5592541dee1b004853503
Test: added
(cherry picked from commit
cfe4ffecceee005ff6bc79dcc1637f44f82bd43a)
Romain Guy [Mon, 17 Apr 2017 19:31:09 +0000 (12:31 -0700)]
resolve merge conflicts of
2439e19d4127 to master
Test: built locally
Change-Id: Idc922c7fa3306e6884b88c79e73f5375d8e65888
Geoffrey Pitsch [Mon, 17 Apr 2017 19:28:40 +0000 (15:28 -0400)]
Warning if app targeting O posts a notification with no channel
Uses toast, but does not prevent the notification from posting.
Test: runtest systemui-notification
Bug:
35378789
Change-Id: I81426ee22a004b1d766f810565822a1ea237ccb4
TreeHugger Robot [Mon, 17 Apr 2017 19:22:43 +0000 (19:22 +0000)]
Merge "EUICC API changes to support error resolution."
Jason Monk [Mon, 17 Apr 2017 19:22:30 +0000 (15:22 -0400)]
Fix date going missing in QS
Test: Dismiss alarm while QS is expanded
Change-Id: I491deda22848af08db36dcffcb678f6ce2f1bdda
Fixes:
37259783
Jason Monk [Thu, 13 Apr 2017 19:27:04 +0000 (15:27 -0400)]
Status bar updates
- Wifi moves to right of cell
- Cell data and roaming indicator swap places
- Data disabled and no internet on cell look the same
- Don't show wifi in QS signal cluster, it has its status
right below.
Test: visual && runtest systemui
Fixes:
36717491
Change-Id: I16ebe6fb6dd519526a1e174753c8ce08c713d405
Joe LaPenna [Mon, 17 Apr 2017 19:08:19 +0000 (19:08 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
am:
5b06dbd12b
Change-Id: I29bf802473cd98352390a12120d2bbd9b293f5cf
TreeHugger Robot [Mon, 17 Apr 2017 19:02:58 +0000 (19:02 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
Brian Duddie [Mon, 17 Apr 2017 19:01:57 +0000 (19:01 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev
am:
befd33975c
Change-Id: Id27aa1ec7d76e6f74a0f436ba5f8bd1643991f6e
OSDN Git Service
