OSDN Git Service
Erik Wolsheimer [Tue, 18 Apr 2017 20:19:13 +0000 (20:19 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef am:
28fc6a28aa -s ours
am:
4f9d4bfb3e
Change-Id: I5e760fcb4f5da57dae57a0c80fac4f0915529691
Etan Cohen [Tue, 18 Apr 2017 20:10:28 +0000 (20:10 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev
am:
c367ee166b
Change-Id: I19d91f8133c7294de3350277efff339bd75f42b8
Erik Wolsheimer [Tue, 18 Apr 2017 20:09:30 +0000 (20:09 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef
am:
28fc6a28aa -s ours
Change-Id: I3e83332cd4bd7e51a3394ee5de61afc613fe9552
Etan Cohen [Tue, 18 Apr 2017 20:04:16 +0000 (20:04 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev
Erik Wolsheimer [Tue, 18 Apr 2017 20:03:46 +0000 (20:03 +0000)]
DO NOT MERGE Mask case of base or tree permission being null
am:
cb8a640cef
Change-Id: I43289a33b8e1e6df9307cd11891feff4d739da14
phweiss [Tue, 18 Apr 2017 19:58:53 +0000 (19:58 +0000)]
Merge "Decrease number of network logging notifications shown" into oc-dev
am:
11fbd2148f
Change-Id: I26d3966fc079e92fab3377595eec9f01bd17fb90
TreeHugger Robot [Tue, 18 Apr 2017 19:50:36 +0000 (19:50 +0000)]
Merge "Decrease number of network logging notifications shown" into oc-dev
Wale Ogunwale [Tue, 18 Apr 2017 19:48:29 +0000 (19:48 +0000)]
Merge "Fixed some pip state acitvity accounting." into oc-dev
am:
6535ef67b7
Change-Id: Ibcb5992194f8b50a0d6451e43918e1260533c635
Wale Ogunwale [Tue, 18 Apr 2017 19:40:43 +0000 (19:40 +0000)]
Merge "Fixed some pip state acitvity accounting." into oc-dev
Julia Reynolds [Tue, 18 Apr 2017 19:21:51 +0000 (19:21 +0000)]
Merge "Lock all the things" into oc-dev
am:
7e4e923a8c
Change-Id: Iee7b299db15a6d6ada863b2fddbad9dfed3b700d
Julia Reynolds [Tue, 18 Apr 2017 19:13:05 +0000 (19:13 +0000)]
Merge "Lock all the things" into oc-dev
Hassan Shojania [Tue, 18 Apr 2017 18:50:32 +0000 (18:50 +0000)]
Merge "MediaPlayer/ModularDrm API review" into oc-dev
am:
62a5d29f2d
Change-Id: Id4e021e15c0c42a8c075fd393c07938e17e9a6fe
Erik Wolsheimer [Tue, 18 Apr 2017 16:27:31 +0000 (09:27 -0700)]
DO NOT MERGE Mask case of base or tree permission being null
Bug:
34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2
Hassan Shojania [Tue, 18 Apr 2017 18:41:23 +0000 (18:41 +0000)]
Merge "MediaPlayer/ModularDrm API review" into oc-dev
Julia Reynolds [Tue, 18 Apr 2017 13:28:22 +0000 (09:28 -0400)]
Lock all the things
Fix some instances of .*Locked() methods being called without
holding mNotificationLock.
Also, if this happens again, don't crash system server
Change-Id: I0a51310a6f6c8b07266092176e189e7cd08778cc
Fixes:
37444864
Test: runtest systemui-notification
Geoffrey Pitsch [Tue, 18 Apr 2017 17:50:49 +0000 (17:50 +0000)]
Merge "Don't let toasting throw a runtime exception." into oc-dev
am:
4b0d2bf70a
Change-Id: Ic37f81a2f8617851b50eb6e44f5fb7e9d2e0a1f0
Wale Ogunwale [Tue, 18 Apr 2017 14:25:20 +0000 (07:25 -0700)]
Fixed some pip state acitvity accounting.
- Corrected ActivityRecord.checkEnterPictureInPictureState() to return
false if the activity doesn't support Pip.
- Wait for previous activity that supports pip to pause before resuming
the next activity with FLAG_RESUME_WHILE_PAUSING so that the activity
has a chance to enter Pip before we resume the next activity. Currently
disabled until we figure-out if callers are passing in the right value
for prev.
- Changed stopActivityLocked() to call setVisible() instead of
setVisibility()...yeah this isn't confusing...
Change-Id: If2336ece4fe5b7104c9b301a4ded5cadc2c2f7cb
Bug:
37370508
Test: manual
Geoffrey Pitsch [Tue, 18 Apr 2017 17:41:50 +0000 (17:41 +0000)]
Merge "Don't let toasting throw a runtime exception." into oc-dev
Geoffrey Pitsch [Tue, 18 Apr 2017 17:19:48 +0000 (13:19 -0400)]
Don't let toasting throw a runtime exception.
Not sure why is complaining about the Looper.
(The toast is debug code that will be removed for ship.)
Change-Id: I5e2ecbe40687cd626b235e248fe6d12fea14204a
Fixes:
37455183
Test: runtest systemui-notification
Derek Sollenberger [Tue, 18 Apr 2017 16:19:12 +0000 (16:19 +0000)]
Merge "Remove round rect clipping optimization." into oc-dev
am:
190fe086df
Change-Id: I7b457216863872d7287e777097e04f99d2f18326
Derek Sollenberger [Tue, 18 Apr 2017 16:06:35 +0000 (16:06 +0000)]
Merge "Remove round rect clipping optimization." into oc-dev
Makoto Onuki [Tue, 18 Apr 2017 16:03:29 +0000 (16:03 +0000)]
Merge "Log screen-on latency with tron" into oc-dev
am:
2b499e4eba
Change-Id: I403d3daa5c12dc1465ae8d1a37dc6cddc27f18f9
Jean-Michel Trivi [Tue, 18 Apr 2017 16:02:08 +0000 (16:02 +0000)]
Merge "Vol key presses: active stream has priority of set control stream" into oc-dev
am:
031cf14582
Change-Id: I947a90d8af6c77f619edc67f0338e4580727f1d9
Makoto Onuki [Tue, 18 Apr 2017 15:56:27 +0000 (15:56 +0000)]
Merge "Log screen-on latency with tron" into oc-dev
Jean-Michel Trivi [Tue, 18 Apr 2017 15:54:09 +0000 (15:54 +0000)]
Merge "Vol key presses: active stream has priority of set control stream" into oc-dev
Andrei Stingaceanu [Tue, 18 Apr 2017 14:30:10 +0000 (14:30 +0000)]
Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev
am:
2ed861d560
Change-Id: I0097c1a6ab90fe1e9085c36b2777a708ea616403
Andrei Stingaceanu [Tue, 18 Apr 2017 14:20:24 +0000 (14:20 +0000)]
Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev
Bryce Lee [Tue, 18 Apr 2017 14:20:32 +0000 (14:20 +0000)]
Merge "Deprecate ActivityManager#getRunningServices" into oc-dev
am:
25b7687771
Change-Id: Id37de21d7c3ed7436a1fc75a64c300a4bf622fc6
Bryce Lee [Tue, 18 Apr 2017 14:10:53 +0000 (14:10 +0000)]
Merge "Deprecate ActivityManager#getRunningServices" into oc-dev
Etan Cohen [Thu, 30 Mar 2017 15:54:39 +0000 (08:54 -0700)]
[AWARE] Implement custom Wi-Fi Aware network specifier
Convert Wi-Fi Aware connectivity requests to use a custom
network specifier (as opposed to a string). Aside from
simplifying code, allows for more control of information
printed out, and of additional information to be packaged
and used in network decisions (uid - TBD).
(cherry-pick of commit
a5028455a4b7592091f12c80d4b4d42c9c866d66)
Bug:
36275276
Bug:
36053921
Test: unit tests and integration (sl4a) tests passing.
Merged-In: I776fb348b15ec4830f890a8ac5c41f24594e12a7
Change-Id: I776fb348b15ec4830f890a8ac5c41f24594e12a7
phweiss [Thu, 30 Mar 2017 15:57:20 +0000 (17:57 +0200)]
Decrease number of network logging notifications shown
Now, network logging will show one notification when it is enabled
and one after the next reboot.
Bug:
36254499
Test: CTS Verifier > Managed Provisioning > Device Owner Tests
> Network Logging UI
Change-Id: I60fc64e96ceb0ec0ae7ca832b74ac8b47e581be4
(cherry picked from commit
55dba53ed433d713a075ba0de15504a1ed42852b)
Abodunrinwa Toki [Tue, 18 Apr 2017 13:08:26 +0000 (13:08 +0000)]
Merge "FloatingToolbar: Rules for ordering menu items." into oc-dev
am:
6d149bc953
Change-Id: I2cb81342813f3ea402044e9c067a066d76873f94
Abodunrinwa Toki [Tue, 18 Apr 2017 12:58:27 +0000 (12:58 +0000)]
Merge "FloatingToolbar: Rules for ordering menu items." into oc-dev
Erik Kline [Tue, 18 Apr 2017 11:46:49 +0000 (11:46 +0000)]
Merge "Flatten the transitions to tethering and hotspot." into oc-dev
am:
2d9a145115
Change-Id: Ie0dcc60f0a85a0be8bfd7511d01267b3eebc8d66
TreeHugger Robot [Tue, 18 Apr 2017 11:40:22 +0000 (11:40 +0000)]
Merge "Flatten the transitions to tethering and hotspot." into oc-dev
Orion Hodson [Tue, 18 Apr 2017 10:46:19 +0000 (10:46 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()" into oc-dev
am:
6c16732376
Change-Id: Ie2750427f4b1baf80588ffb6ecc3b0e2d3a96288
Orion Hodson [Tue, 18 Apr 2017 10:39:59 +0000 (10:39 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()" into oc-dev
Andrei Stingaceanu [Wed, 12 Apr 2017 14:57:38 +0000 (15:57 +0100)]
AutoSize TextView - take horizontalScrolling into account
When passing the characteristics of the current TextView
to the StaticLayout for auto-size measurements also take
the horizontallyScrolling into account similarly with how
the actual measurements are done (@ TextView#onMeasure).
Bug:
37254477
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t\
android.widget.cts.TextViewTest
Change-Id: I44b85e77d9b1770f188a0f59f103e3fda284e97a
Erik Kline [Tue, 18 Apr 2017 09:00:48 +0000 (09:00 +0000)]
Merge "Flatten the transitions to tethering and hotspot." am:
af5f00ee5e am:
22b9eb972e
am:
b86a7e8d3a
Change-Id: I09520c603482b55ae4f360309f7b1aa12ac74724
Erik Kline [Tue, 18 Apr 2017 08:55:13 +0000 (08:55 +0000)]
Merge "Flatten the transitions to tethering and hotspot." am:
af5f00ee5e
am:
22b9eb972e
Change-Id: Idadc3d15c58a9cc6ac28784e3d507b4d2a83755a
Lorenzo Colitti [Tue, 18 Apr 2017 08:51:20 +0000 (08:51 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" am:
a9cbda5bd8 am:
1d82eb0612
am:
0d89fcc628
Change-Id: Ia6549a6fa404518d091ecb7bd74ece41f547d8c7
Erik Kline [Tue, 18 Apr 2017 08:50:09 +0000 (08:50 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
am:
af5f00ee5e
Change-Id: I0dd0a95e29b645d018d4d4f44696c2339f5d1127
Lorenzo Colitti [Tue, 18 Apr 2017 08:40:41 +0000 (08:40 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" am:
a9cbda5bd8
am:
1d82eb0612
Change-Id: I05548901d1fddb67775bf2079c769b6bbc2b194c
Treehugger Robot [Tue, 18 Apr 2017 08:39:40 +0000 (08:39 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
Lorenzo Colitti [Tue, 18 Apr 2017 08:30:13 +0000 (08:30 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier"
am:
a9cbda5bd8
Change-Id: I1cad06f1296a9c94a9184d8424f7fc57c8f41adb
Lorenzo Colitti [Tue, 18 Apr 2017 08:22:51 +0000 (08:22 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier"
Felipe Leme [Tue, 18 Apr 2017 04:08:53 +0000 (04:08 +0000)]
Merge "Renamed ViewNode's getAutoFillHints() to getAutofillHints()" into oc-dev
am:
cf7cb9c993
Change-Id: I458c2a4e8c54c76732e024199f23705782a7a2f8
TreeHugger Robot [Tue, 18 Apr 2017 04:01:58 +0000 (04:01 +0000)]
Merge "Renamed ViewNode's getAutoFillHints() to getAutofillHints()" into oc-dev
Andreas Gampe [Tue, 18 Apr 2017 03:17:27 +0000 (03:17 +0000)]
Merge "OtaDexopt: Add version support" into oc-dev
am:
0c1b4769c7
Change-Id: Iafe977f04c59696181cd7d466e78693147b520e7
TreeHugger Robot [Tue, 18 Apr 2017 03:07:14 +0000 (03:07 +0000)]
Merge "OtaDexopt: Add version support" into oc-dev
Nathan Harold [Tue, 18 Apr 2017 03:06:36 +0000 (03:06 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" into oc-dev
am:
0680962133
Change-Id: I913132060740dbf28255cbe4e1248ffd20ce455d
TreeHugger Robot [Tue, 18 Apr 2017 02:50:50 +0000 (02:50 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" into oc-dev
Jean-Michel Trivi [Sat, 15 Apr 2017 19:41:05 +0000 (12:41 -0700)]
Vol key presses: active stream has priority of set control stream
When deciding which volume stream is to be controlled by key
presses, give priority to the stream that is actually playing,
unless the user has selected a another volume to be controlled
by the key presses.
Test: play some music over headset, pause, go to home screen.
Press vol up, it changes ringer volume, immediately press play
and press vol up again, it should now change music volume
(and UI updates to indicate that).
Bug:
33355229
Change-Id: Ibad9b59a692e1c6375487b739c55fdbf07f107dd
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
Felipe Leme [Tue, 18 Apr 2017 01:50:14 +0000 (18:50 -0700)]
Renamed ViewNode's getAutoFillHints() to getAutofillHints()
Test: CtsAutoFillServiceTestCases pass
Bug:
35956626
Bug:
35364993
Change-Id: I2ad5a625da6ed4ff889315923c81cfd629e34074
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
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
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
TreeHugger Robot [Mon, 17 Apr 2017 23:57:33 +0000 (23:57 +0000)]
Merge "only log calling package for instant apps" into oc-dev
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
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