OSDN Git Service
Christopher Tate [Tue, 18 Apr 2017 03:16:49 +0000 (03:16 +0000)]
Merge "Turn down the preliminary foreground service API" into oc-dev am:
00ed0baca8
am:
663de998e7
Change-Id: I1c70471deaa3991945d2950d1c6e0f5bc90805b4
Jean-Michel Trivi [Tue, 18 Apr 2017 03:12:18 +0000 (03:12 +0000)]
Merge "AudioService: fix updating of stream alias for A11y" into oc-dev am:
d67925165f
am:
dd9f14c5cd
Change-Id: Iaec8f2ebac9241ac043b3cf3773880336a230f8a
Casey Burkhardt [Tue, 18 Apr 2017 03:08:20 +0000 (03:08 +0000)]
Merge "Shows navbar in SUW if the a11y button is requested" into oc-dev am:
59887efcb9
am:
11d8c565ed
Change-Id: I0eb9a5958614a0ff212a83f2dc0ecc8271f00e60
Wale Ogunwale [Tue, 18 Apr 2017 02:44:33 +0000 (02:44 +0000)]
Merge "Defer showing pip menu activity until pip animation ends" into oc-dev am:
d2ec5a62c7
am:
a382929700
Change-Id: I8d72803edb1b6987b97253654a9752679199d95f
Winson Chung [Tue, 18 Apr 2017 02:43:19 +0000 (02:43 +0000)]
Merge "Account for content insets in source rect hint for transition into PiP" into oc-dev am:
eef5d285f9
am:
60c9403f10
Change-Id: I9d14c0aaeaa84548c307c315b022729092cd0e49
Robert Carr [Tue, 18 Apr 2017 02:42:04 +0000 (02:42 +0000)]
Merge "DecorView: Avoid changing shadow size in Pinned Stack." into oc-dev am:
cc824e77c8
am:
75fd277d58
Change-Id: I18c6eb12b3ca23d25e513be0deece45d2ac39f22
gomo [Tue, 18 Apr 2017 02:40:45 +0000 (02:40 +0000)]
Merge "If gnss service dies, then, upon receiving the death notification on system-server side: Proactively take down the whole system_server." into oc-dev am:
87180be1b3
am:
644c10a6bb
Change-Id: Id971bc16c9619aef719037efe60ea52626052e91
Yohei Yukawa [Tue, 18 Apr 2017 02:39:38 +0000 (02:39 +0000)]
Merge "A new power button mode to hide the IME when shown" into oc-dev am:
eb9fb8e0d0
am:
e075fe1035
Change-Id: Ie82bee897cc80b6784856fef1600d331ba8bbe33
Dianne Hackborn [Tue, 18 Apr 2017 02:37:06 +0000 (02:37 +0000)]
Merge "Finish impl of job queue: handle URI permissions." into oc-dev am:
6e8f116647
am:
cc4763071d
Change-Id: I02ee3531c37cc990ac4b6408f3452636680c8728
Dianne Hackborn [Tue, 18 Apr 2017 02:32:36 +0000 (02:32 +0000)]
Merge "More small fixes/adjustments to job scheduler." into oc-dev am:
950fa06a29
am:
46c91418e9
Change-Id: Ifef32df2ad01134bed8cb662287ebedd461dcccf
Sungsoo Lim [Tue, 18 Apr 2017 02:29:39 +0000 (02:29 +0000)]
Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev am:
ab16ea9094
am:
0432fd9aa5
Change-Id: I22da246b549f88b982c69eaa383747bf747dc3b6
Adrian Roos [Tue, 18 Apr 2017 02:26:35 +0000 (02:26 +0000)]
Merge "AOD: Implement redacted notificatinos" into oc-dev am:
89e8b7b58e
am:
0ded7c8578
Change-Id: I83239f9124595c1bd8ca113e3b6afcee48935375
Sungsoo Lim [Tue, 18 Apr 2017 02:23:44 +0000 (02:23 +0000)]
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev am:
a44d7cd25b
am:
a8647cb547
Change-Id: I3c9d9d7b959173a68cff2bb0468cad7d888c0ccf
Sungsoo Lim [Tue, 18 Apr 2017 02:19:56 +0000 (02:19 +0000)]
Merge "MediaBrowser: Revert Search API" into oc-dev am:
51d91bff17
am:
09c3bdd1db
Change-Id: I7a5ad65672f473995a4be902a26b926210d2f4e5
Adrian Roos [Tue, 18 Apr 2017 02:17:26 +0000 (02:17 +0000)]
Merge "AOD: Do not show guts nor snooze" into oc-dev am:
96da371a6d
am:
a4f06716da
Change-Id: Id57b55adf501c3c58c36ae9e4bf2c119e7a137cd
Dianne Hackborn [Tue, 18 Apr 2017 02:16:14 +0000 (02:16 +0000)]
Merge "Fix issue #
36858643: Runtime restart on OPR1.170323.002" into oc-dev am:
4bcc9bf0f2
am:
6aeb47b83d
Change-Id: Ic81ad08f8a00dffff3d8d14925da05d05418ed62
Todd Kennedy [Tue, 18 Apr 2017 02:14:59 +0000 (02:14 +0000)]
Merge "only log calling package for instant apps" into oc-dev am:
00168492a8
am:
cdd5253b1a
Change-Id: Ic53410728ad37a9e6fa575254492c35f699ad792
Mike Tsao [Tue, 18 Apr 2017 02:11:03 +0000 (02:11 +0000)]
Merge "Cleanup that wasn't uploaded with ag/
2094132" into oc-dev am:
3244faae29
am:
b1167d30a5
Change-Id: I9cf2c39e0889878cf2140593a66151342fab2117
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
Christopher Tate [Tue, 18 Apr 2017 01:58:32 +0000 (01:58 +0000)]
Merge "Turn down the preliminary foreground service API" into oc-dev
am:
00ed0baca8
Change-Id: I50fba7a59e4f52500f4708e194864dc9dece8c71
TreeHugger Robot [Tue, 18 Apr 2017 01:54:52 +0000 (01:54 +0000)]
Merge "resolve merge conflicts of
5e511e588d49 to master"
Jean-Michel Trivi [Tue, 18 Apr 2017 01:49:58 +0000 (01:49 +0000)]
Merge "AudioService: fix updating of stream alias for A11y" into oc-dev
am:
d67925165f
Change-Id: I7c321a2237ba880bfcde86dc9bbf00c9a65058a5
TreeHugger Robot [Tue, 18 Apr 2017 01:48:25 +0000 (01:48 +0000)]
Merge "Turn down the preliminary foreground service API" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 01:48:29 +0000 (01:48 +0000)]
Merge "Shows navbar in SUW if the a11y button is requested" into oc-dev
am:
59887efcb9
Change-Id: Ia17156805f8d53e665dbfda468ac366cbd8136fb
Wale Ogunwale [Tue, 18 Apr 2017 01:47:13 +0000 (01:47 +0000)]
Merge "Defer showing pip menu activity until pip animation ends" into oc-dev
am:
d2ec5a62c7
Change-Id: I2413fae7813f795c6e88c225dc6b8fc1964eee52
TreeHugger Robot [Tue, 18 Apr 2017 01:42:11 +0000 (01:42 +0000)]
Merge "AudioService: fix updating of stream alias for A11y" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 01:41:48 +0000 (01:41 +0000)]
Merge "Shows navbar in SUW if the a11y button is requested" into oc-dev
Winson Chung [Tue, 18 Apr 2017 01:40:59 +0000 (01:40 +0000)]
Merge "Account for content insets in source rect hint for transition into PiP" into oc-dev
am:
eef5d285f9
Change-Id: I12e3575937e92923db2bf0deea9c8d88cfb3e314
TreeHugger Robot [Tue, 18 Apr 2017 01:38:58 +0000 (01:38 +0000)]
Merge "Defer showing pip menu activity until pip animation ends" into oc-dev
Robert Carr [Tue, 18 Apr 2017 01:37:12 +0000 (01:37 +0000)]
Merge "DecorView: Avoid changing shadow size in Pinned Stack." into oc-dev
am:
cc824e77c8
Change-Id: I05368f1e5067b62652bd6b3d80dd438fe432723f
gomo [Tue, 18 Apr 2017 01:36:03 +0000 (01:36 +0000)]
Merge "If gnss service dies, then, upon receiving the death notification on system-server side: Proactively take down the whole system_server." into oc-dev
am:
87180be1b3
Change-Id: Idbb5ba5d91ac7e88adfee93bcc6375385eff2d23
TreeHugger Robot [Tue, 18 Apr 2017 01:33:23 +0000 (01:33 +0000)]
Merge "Account for content insets in source rect hint for transition into PiP" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 01:29:01 +0000 (01:29 +0000)]
Merge "DecorView: Avoid changing shadow size in Pinned Stack." into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 01:24:06 +0000 (01:24 +0000)]
Merge "If gnss service dies, then, upon receiving the death notification on system-server side: Proactively take down the whole system_server." into oc-dev
Yohei Yukawa [Tue, 18 Apr 2017 01:23:30 +0000 (01:23 +0000)]
Merge "A new power button mode to hide the IME when shown" into oc-dev
am:
eb9fb8e0d0
Change-Id: I67cf177275889be09b2b4ecf2f9ae3589846d853
Dianne Hackborn [Tue, 18 Apr 2017 01:19:50 +0000 (01:19 +0000)]
Merge "Finish impl of job queue: handle URI permissions." into oc-dev
am:
6e8f116647
Change-Id: I9d053f2e96712646fe2935ddc2c3729690a06be1
TreeHugger Robot [Tue, 18 Apr 2017 01:12:59 +0000 (01:12 +0000)]
Merge "A new power button mode to hide the IME when shown" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 01:07:10 +0000 (01:07 +0000)]
Merge "Finish impl of job queue: handle URI permissions." into oc-dev
Dianne Hackborn [Tue, 18 Apr 2017 00:58:27 +0000 (00:58 +0000)]
Merge "More small fixes/adjustments to job scheduler." into oc-dev
am:
950fa06a29
Change-Id: I3a59cfcb955b33276f514c2d3086501a413733a7
Sungsoo Lim [Tue, 18 Apr 2017 00:53:14 +0000 (00:53 +0000)]
Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev
am:
ab16ea9094
Change-Id: I84277311c9215c23ecb02ccef90a54e89d921cb4
Adrian Roos [Tue, 18 Apr 2017 00:50:02 +0000 (00:50 +0000)]
Merge "AOD: Implement redacted notificatinos" into oc-dev
am:
89e8b7b58e
Change-Id: I92526d3c656647fa42c0a6266d4d33f035e54c9f
TreeHugger Robot [Tue, 18 Apr 2017 00:47:02 +0000 (00:47 +0000)]
Merge "More small fixes/adjustments to job scheduler." into oc-dev
Sungsoo Lim [Tue, 18 Apr 2017 00:46:57 +0000 (00:46 +0000)]
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
am:
a44d7cd25b
Change-Id: I0831739bd0eb7317ea69adc7569d86e11a1f9fb3
TreeHugger Robot [Tue, 18 Apr 2017 00:39:17 +0000 (00:39 +0000)]
Merge "SoundTriggerHelper: Remove unused models onLoad"
Sungsoo Lim [Tue, 18 Apr 2017 00:37:33 +0000 (00:37 +0000)]
Merge "MediaBrowser: Revert Search API" into oc-dev
am:
51d91bff17
Change-Id: I0ec694cdbf24bd6e9dbacb22b93b4b644c3f524d
Sungsoo Lim [Tue, 18 Apr 2017 00:32:51 +0000 (00:32 +0000)]
Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 00:31:52 +0000 (00:31 +0000)]
Merge "AOD: Implement redacted notificatinos" into oc-dev
Sungsoo Lim [Tue, 18 Apr 2017 00:31:28 +0000 (00:31 +0000)]
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
Sungsoo Lim [Tue, 18 Apr 2017 00:26:18 +0000 (00:26 +0000)]
Merge "MediaBrowser: Revert Search API" into oc-dev
Adrian Roos [Tue, 18 Apr 2017 00:17:26 +0000 (00:17 +0000)]
Merge "AOD: Do not show guts nor snooze" into oc-dev
am:
96da371a6d
Change-Id: I9aea00c77f69134dedde0f77c277a0eed815a125
Dianne Hackborn [Tue, 18 Apr 2017 00:15:46 +0000 (00:15 +0000)]
Merge "Fix issue #
36858643: Runtime restart on OPR1.170323.002" into oc-dev
am:
4bcc9bf0f2
Change-Id: Ia81a46e967dc3a9cebe8bb82947ccd72ca9ef862
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
TreeHugger Robot [Tue, 18 Apr 2017 00:07:58 +0000 (00:07 +0000)]
Merge "AOD: Do not show guts nor snooze" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 00:04:45 +0000 (00:04 +0000)]
Merge "Fix issue #
36858643: Runtime restart on OPR1.170323.002" into oc-dev
Todd Kennedy [Tue, 18 Apr 2017 00:04:11 +0000 (00:04 +0000)]
Merge "only log calling package for instant apps" into oc-dev
am:
00168492a8
Change-Id: Ic7b875decf99989d7fb216a8df6878575027ac6d
Mike Tsao [Tue, 18 Apr 2017 00:03:01 +0000 (00:03 +0000)]
Merge "Cleanup that wasn't uploaded with ag/
2094132" into oc-dev
am:
3244faae29
Change-Id: Ia494631b64d9cd670ac0045e2e8e9e9a5fa52bcc
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
TreeHugger Robot [Mon, 17 Apr 2017 23:57:33 +0000 (23:57 +0000)]
Merge "only log calling package for instant apps" into oc-dev
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
TreeHugger Robot [Mon, 17 Apr 2017 23:53:49 +0000 (23:53 +0000)]
Merge "Cleanup that wasn't uploaded with ag/
2094132" into oc-dev
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
Jean-Michel Trivi [Sat, 15 Apr 2017 01:13:26 +0000 (18:13 -0700)]
AudioService: fix updating of stream alias for A11y
VolumeStreamState.setAllIndexes():
- don't do anything if the target and source VSS have the same
stream type,
- javadoc of (old+new) behavior.
When STREAM_ACCESSIBILITY becomes independent of any other stream,
read the settings to restore the volumes previously set.
Test: see bug
Bug:
36286803
Change-Id: I2afcff3a93cc81f3958af252986ef1ac9c38899e
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
Yohei Yukawa [Mon, 17 Apr 2017 17:35:27 +0000 (10:35 -0700)]
A new power button mode to hide the IME when shown
As discussed in Bug
33038203 on certain platforms there is a demand
that the power button can change the behavior depending on whether an
IME window is shown on the screen or not. The behavior requested here
can be summarized into two parts:
* Hide the IME window if it is shown [1]
* Go to the home screen if no IME window is shown
This CL implements the above request by introducing a new config mode
for config_shortPressOnPowerBehavior. Note the definition of when an
IME is shown is often tricky than people would expect. The way this
CL is implemented is to propagate IME window state from
InputMethodManagerService (IMMS) to PhoneWindowManager via
WindowManagerService regarding when the back button on the NavBar for
phones/tablets should be shown as an IME dismiss key [2].
[1]: Even with this CL the IME still is allowed to ignore the request
to hide the software keyboard. Currently there is no official
protocol to forcefully hide the software keyboard. How to deal
with such a situation is a long standing TODO task.
[2]: Internally this is controlled by the following IMMS fields:
- InputMethodManagerService#mImeWindowVis
- InputMethodManagerService#mBackDisposition
Note that those fields rely on self-report from the IME. To be
precise, the base implementation of InputMethodService is
responsible for report back its internal state to IMMS when
necessary. The important point is that, although this could
allow a malicious IME to confuse the system UI to some extent,
supporting malicious IMEs is not clearly a goal of Android.
Anyway, the definition of when an IME is shown is a kind of
hot topic in several system services recently. Hopefully we
can come up with better definition and reliable mechanism in
a future release.
Fixes:
33824860
Test: Manually verified as follows
1. Change config_shortPressOnPowerBehavior to "5"
2. Rebuilt the OS image and flash it to the device
3. Make sure that the power button works like a home button
if software keyboard is not shown.
4. Open dialer and focus in to the text field shown on top
5. Make sure that the AOSP keyboard is shown.
6. Run 'adb shell dumpsys input_method' to observe the
following line:
mImeWindowVis=Active|Visible
7. Tap the power button to make sure that the AOSP keyboard
gets dismissed.
8. Tap the power button again to make sure that it works
as if a home button.
Test: Manually tested as follows
1. Open dialer and focus in to the text field to show an IME
2. Run 'adb shell dumpsys window policy' to make sure
mDismissImeOnBackKeyPressed=true
3. Tap the back button to dismiss the IME
4. Run 'adb shell dumpsys window policy' to make sure
mDismissImeOnBackKeyPressed=false
Change-Id: I20721547c73360a70b5fc5cbe06824d577d1768a
Wale Ogunwale [Mon, 17 Apr 2017 21:16:43 +0000 (14:16 -0700)]
Defer showing pip menu activity until pip animation ends
This was causes additional churn in the system delaying the visibility
of the activity behind the one we are pipping. We now delay starting the
pip menu activity until the enter pip animation is done.
This doesn't fix the real issue where we don't wait for app transition
to be finished before starting pip, but it does make it much harder to
the user to trigger the case. Will do that in a follow-up CL.
Test: manual
Bug:
37420370
Change-Id: Ic0271d693d45c3e414b3abdf0ad24be44ff5ae5c
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
Dianne Hackborn [Fri, 14 Apr 2017 01:04:31 +0000 (18:04 -0700)]
Finish impl of job queue: handle URI permissions.
The job queue now handles URI permissions associated with
the Intent of each job. Just (kind-of) like Service!
Also do the second pass of locking in job scheduler, getting
rid of all the async dispatching on a handler, and just executing
calls right in line with simple locking. This probably fixes
a few other race issues, and allows us to make sure that we
always finish a job correctly when dequeuing the last work (we
will always atomically dequeue and finish, so no new work can
slip in between).
And fix a little debug output in IntentFilter.
Test: ran CtsJobSchedulerTestCases, added new test for URI perms.
Change-Id: I52f700ef0cd5be3ff70050f9c0f5fe3e8a5ccac1
Winson Chung [Mon, 17 Apr 2017 21:21:44 +0000 (14:21 -0700)]
Account for content insets in source rect hint for transition into PiP
- As a part of transitioning into PiP, we remove the content insets, and
as a result, we also need to adjust the source hint rect for the change
in insets as well.
Bug:
37418994
Test: Enter PiP from YT, ensure no jump at the end
Change-Id: I74219b05c91d3c8b8466dd8fff4d6dd692f08725
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
Robert Carr [Mon, 17 Apr 2017 22:11:35 +0000 (15:11 -0700)]
DecorView: Avoid changing shadow size in Pinned Stack.
It seems at the end of the animation, sometimes we will
come to think we have focus, before we have properly
updated mStackId. This in-and-of itself seems like
somewhat of an issue...but I'm not inclined to dig too
deeply at the moment. For now just ensure a static shadow
size in the pinned stack.
Bug:
37425446
Test: Manual
Change-Id: I379f7a6de51670c90eacb52a5be5e17784be8ac5
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
Adrian Roos [Mon, 17 Apr 2017 18:17:59 +0000 (11:17 -0700)]
AOD: Implement redacted notificatinos
Test: Turn on "show sensitive notifications on lockscreen", receive notification, observe AOD
Bug:
36610748
Change-Id: I981ef4cea7cefc76dcd55ebad9d05c758927dabb
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
Dianne Hackborn [Mon, 17 Apr 2017 20:34:51 +0000 (13:34 -0700)]
More small fixes/adjustments to job scheduler.
- JobServiceEngine now takes a concrete Service instead of
generic Context in its constructor, since it really must be
associated with a real Service.
- Expand documentation of how dequeueWork() operates.
- Fix some job scheduler implementation to hopefully actually
match the docs: transfer remaining executing work to the new
job, and actually correctly transfer state from old and new
jobs if we are rescheduling due to a true return from onStopJob().
Test: bit CtsJobSchedulerTestCases:*
Change-Id: Ia66797049883eefb566264f930070afb69d469b1
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