OSDN Git Service
Chet Haase [Wed, 4 May 2016 21:51:33 +0000 (21:51 +0000)]
Merge "Force second measure pass when there is a configuration change" into nyc-dev
am:
c381c4e8e7
* commit '
c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
Force second measure pass when there is a configuration change
Change-Id: I34afe7f97bc141bc4981643f61518d4bcbf29ba7
Chet Haase [Wed, 4 May 2016 21:49:09 +0000 (21:49 +0000)]
Merge "Force second measure pass when there is a configuration change" into nyc-dev
Yohei Yukawa [Wed, 4 May 2016 21:42:43 +0000 (21:42 +0000)]
Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev
am:
68c1e1935d
* commit '
68c1e1935d5c3de080513a31b305eef722ee380c':
Fix a behavior change in "Show software keyboard".
Change-Id: Ia7069eb539a9b809bc3e14514bee16149c9151c8
Yohei Yukawa [Wed, 4 May 2016 21:39:13 +0000 (21:39 +0000)]
Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev
Steve McKay [Wed, 4 May 2016 21:37:39 +0000 (21:37 +0000)]
Merge "Finish selection mode after copyto and share..." into nyc-dev
am:
94e3b80d5b
* commit '
94e3b80d5b3fd88f6656cb5cae813c4e63faebff':
Finish selection mode after copyto and share...
Change-Id: If4a47f84569e1cb58eb4d0f3c8e209e78177e615
Amit Mahajan [Wed, 4 May 2016 21:37:29 +0000 (21:37 +0000)]
Merge "Marking @SystemApi permissions @hide too." into nyc-dev
am:
441da79d8a
* commit '
441da79d8aa7b873f23227d10ecd425671b85506':
Marking @SystemApi permissions @hide too.
Change-Id: Ic4516f40e3845b5bc4863a5b52039c2c770d68f4
Makoto Onuki [Wed, 4 May 2016 21:28:15 +0000 (21:28 +0000)]
Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev
TreeHugger Robot [Wed, 4 May 2016 20:58:37 +0000 (20:58 +0000)]
Merge "Finish selection mode after copyto and share..." into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 20:50:14 +0000 (20:50 +0000)]
Merge "Marking @SystemApi permissions @hide too." into nyc-dev
Android Build Merger (Role) [Wed, 4 May 2016 20:49:15 +0000 (20:49 +0000)]
Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am:
5f81a3f84c" into nyc-mr1-dev
Wale Ogunwale [Wed, 4 May 2016 20:48:51 +0000 (20:48 +0000)]
Merge "Make sure to pause activity before stopping" into nyc-dev
am:
5f81a3f84c
* commit '
5f81a3f84c97999f9eb19291c7b4f67ad8576c7c':
Make sure to pause activity before stopping
Change-Id: If6888d7b1a36594045927fa1ab33c82c2899206f
Hyunyoung Song [Wed, 4 May 2016 20:43:08 +0000 (20:43 +0000)]
Merge "Add Shortcut API to Settings (1/2) b/
28298258" into nyc-mr1-dev
David Friedman [Wed, 4 May 2016 20:30:26 +0000 (20:30 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am:
0677d4b715 am:
60e5bc30bb am:
0de8689243 am:
21a55dc82c
am:
6954edf67c
* commit '
6954edf67c9e4f9717d42ddd3b424dd3164062fd':
Docs: Adds fugu to list of Vulkan-supported devices.
Change-Id: I81493f743cc9452469d93eeee81e2b24bca813de
TreeHugger Robot [Wed, 4 May 2016 20:28:49 +0000 (20:28 +0000)]
Merge "Make sure to pause activity before stopping" into nyc-dev
Jason Monk [Wed, 4 May 2016 20:22:16 +0000 (20:22 +0000)]
Merge "Fix QS header size after landscape inflation" into nyc-dev
am:
9ff0083647
* commit '
9ff00836473dca5e91bccf109902246458b44adc':
Fix QS header size after landscape inflation
Change-Id: I97ba6feebc4282e4dcef71e805cf06c9bd2eba55
David Friedman [Wed, 4 May 2016 20:21:53 +0000 (20:21 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am:
0677d4b715 am:
60e5bc30bb am:
0de8689243
am:
21a55dc82c
* commit '
21a55dc82c24ffb8c0d77c1980fe5acc1400001d':
Docs: Adds fugu to list of Vulkan-supported devices.
Change-Id: I372454e0f336d4ae4703ca296e102447db247d61
David Friedman [Wed, 4 May 2016 20:13:37 +0000 (20:13 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am:
0677d4b715 am:
60e5bc30bb
am:
0de8689243
* commit '
0de8689243ae0d48744b7c1584670a10febafe32':
Docs: Adds fugu to list of Vulkan-supported devices.
Change-Id: If89adfe3f280815f26cec7048e50e4d8c9ad7b7d
Jason Monk [Wed, 4 May 2016 20:11:54 +0000 (20:11 +0000)]
Merge "Fix QS header size after landscape inflation" into nyc-dev
Jason Monk [Wed, 4 May 2016 20:08:08 +0000 (16:08 -0400)]
Fix QS header size after landscape inflation
Change-Id: Ic735462d0af2437ed9e74a960ff0dc12126c30f2
Fixes:
28306834
David Friedman [Wed, 4 May 2016 20:04:06 +0000 (20:04 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am:
0677d4b715
am:
60e5bc30bb
* commit '
60e5bc30bbb41f25836a8bbd2a04bc2eab4b7f8c':
Docs: Adds fugu to list of Vulkan-supported devices.
Change-Id: Iab5e6c2b992c241de667476ce74b2bc6a2d4dac9
Makoto Onuki [Wed, 4 May 2016 19:53:37 +0000 (12:53 -0700)]
ShortcutManaegr: bug fixes
Fixes
28590035
Fixes
28586105
Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
David Friedman [Wed, 4 May 2016 20:00:08 +0000 (20:00 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices.
am:
0677d4b715
* commit '
0677d4b7153327fef6b33c90c5bf61f756c1bea3':
Docs: Adds fugu to list of Vulkan-supported devices.
Change-Id: Ida6a6972ff32917eb9367871d6ea0766cc37d05e
Philip P. Moltmann [Wed, 4 May 2016 19:29:18 +0000 (19:29 +0000)]
Merge "Add HP and Mopria print recommendation service" into nyc-dev
am:
9e5d4e078a
* commit '
9e5d4e078a93f187f6ec612734dded61372636fb':
Add HP and Mopria print recommendation service
Change-Id: I6dd1b1dd1787282ad67d7bdd4ffbce070e6de860
Philip P. Moltmann [Wed, 4 May 2016 19:22:56 +0000 (19:22 +0000)]
Merge "Add HP and Mopria print recommendation service" into nyc-dev
David Friedman [Wed, 4 May 2016 19:14:08 +0000 (12:14 -0700)]
Docs: Adds fugu to list of Vulkan-supported devices.
Change-Id: Ic61f5e20c6c950ef7333e56757a782f67bae8da1
Yohei Yukawa [Wed, 4 May 2016 18:56:35 +0000 (11:56 -0700)]
Fix a behavior change in "Show software keyboard".
This bug was a corner case of stopping lying about
Configuration#keyboard when "Show software keyboard" is turned on, which
was done by my CL [1] in Android N development cycle.
Previous implementation
if (config.keyboard != Configuration.KEYBOARD_NOKEYS) {
had relied on the fact that the system was lying about config.keyboard,
which is no longer valid. We need to change the behavior of
InputMethodService#onShowInputRequested() depending on
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD like we did for
InputMethodService#onEvaluateInputViewShown() in [1] to minimize the
impact on stopping lying about Configuration#keyboard.
[1]: Id4d332e3909590c68345e10e1f2e18650efb2eb7
7b739a802cb7d97460a0bf8a1e9774efe96fa552
Bug:
28423439
Change-Id: I8a774cbf61ac706d8446be91b17bceee57a13656
Robin Lee [Wed, 4 May 2016 18:52:53 +0000 (18:52 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am:
7ec93a1ee2
* commit '
7ec93a1ee2d381fdcd3be271712e4179ddbf9829':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I7e3f9edd802dfe7c98abf79dcf8f6fa14ce39c01
Hyunyoung Song [Wed, 4 May 2016 17:23:06 +0000 (10:23 -0700)]
Add Shortcut API to Settings (1/2)
b/
28298258
Initial CL to simply add first time shortcuts in the beginning.
Change-Id: Ib64e3cf1b17979da1548c168cd551ae125289132
Wale Ogunwale [Wed, 4 May 2016 17:24:33 +0000 (10:24 -0700)]
Make sure to pause activity before stopping
In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.
Bug:
28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d
Robin Lee [Wed, 4 May 2016 18:46:19 +0000 (18:46 +0000)]
Merge changes I31d5260d,Ied92f558 into nyc-dev
am:
a5e6553917
* commit '
a5e6553917359bb662c8f2788feb3d617803d406':
Start VPN as early as possible during startup
Split network agent created state from connected state
Change-Id: I5fedffbf3d8f2826b94ccd2f3e1ba1f5563c43af
Andrew Solovay [Wed, 4 May 2016 18:40:54 +0000 (18:40 +0000)]
Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs am:
6006856b24 am:
5c197a1513 am:
99dfd4c92f
am:
a75f01557c
* commit '
a75f01557cb3299de69ae856a06e824535de6e39':
docs: Renaming /go/ top-level directory to /topic/
Change-Id: I278652c5762e5c0e1fa9aafd52986f36a050e504
Robin Lee [Wed, 4 May 2016 18:38:28 +0000 (18:38 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
Robin Lee [Wed, 4 May 2016 18:35:17 +0000 (18:35 +0000)]
Merge changes I31d5260d,Ied92f558 into nyc-dev
* changes:
Start VPN as early as possible during startup
Split network agent created state from connected state
Andrew Solovay [Wed, 4 May 2016 18:30:17 +0000 (18:30 +0000)]
Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs am:
6006856b24 am:
5c197a1513
am:
99dfd4c92f
* commit '
99dfd4c92f13f9fe024fe995261bcfdd8bd61295':
docs: Renaming /go/ top-level directory to /topic/
Change-Id: Ie817cd75f56e9bc8d5080711d0cb7de6887541aa
Andrew Solovay [Wed, 4 May 2016 18:23:07 +0000 (18:23 +0000)]
Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs am:
6006856b24
am:
5c197a1513
* commit '
5c197a1513a1a3b181977c6425a0f542d770a1bc':
docs: Renaming /go/ top-level directory to /topic/
Change-Id: I1a49367d42f2d16e0b3c9c9f41bb844a00052490
Abhijith Shastry [Wed, 4 May 2016 18:22:14 +0000 (18:22 +0000)]
Merge "Update BlockedNumberContract documentation." into nyc-dev
am:
9a2384a7a6
* commit '
9a2384a7a6ad4ff630f125e844f7b202ec3cc649':
Update BlockedNumberContract documentation.
Change-Id: I05aee9d3367e37f783eae34ec33025da463a8306
Chet Haase [Wed, 4 May 2016 14:26:02 +0000 (07:26 -0700)]
Force second measure pass when there is a configuration change
It's possible for a call to updateConfiguration() to happen in the middle
of performTraversals(), after the measure phase has happened, but before
the layout phase. During the configuration call, it's possible for views to
have requestLayout() called on them. This can result in the request flag
not getting cleared, because views that have had layout requested, but which
have not yet been measured, may not be told to layout.
The correct flow should be that any code path causing requestLayout() (which
could be anything that calls out to user/app code) should happen before the
measure phase (or cause a second measure to occur). For now, causing the second
measure to occur is a low-risk simple change that fixes the immediate problem.
Issue #
28152259 Calling requestLayout from inside View.onConfigurationChanged can cause problems
Change-Id: I3b532eeacc3784d8d21193d01ddd7fa15ac0684e
Abhijith Shastry [Wed, 4 May 2016 18:14:36 +0000 (18:14 +0000)]
Merge "Update BlockedNumberContract documentation." into nyc-dev
Andrew Solovay [Wed, 4 May 2016 18:14:32 +0000 (18:14 +0000)]
Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs
am:
6006856b24
* commit '
6006856b24335473e71a58d3bf45d49c57ea6055':
docs: Renaming /go/ top-level directory to /topic/
Change-Id: I6401fd1a31ec8c064387b9a7e49aaf52a76b80f1
Renat Aksitov [Wed, 4 May 2016 18:08:43 +0000 (18:08 +0000)]
Merge "Voice Messaging Intent API." into nyc-dev
am:
d516e30b91
* commit '
d516e30b915ffabd0c09f5726d44c1f51fdeceec':
Voice Messaging Intent API.
Change-Id: I3c63645c1b181e088e8d7b8280a55e875682c4da
Andrew Solovay [Wed, 4 May 2016 18:07:08 +0000 (18:07 +0000)]
Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs
Renat Aksitov [Wed, 4 May 2016 18:02:45 +0000 (18:02 +0000)]
Merge "Voice Messaging Intent API." into nyc-dev
Dongwon Kang [Wed, 4 May 2016 17:42:47 +0000 (17:42 +0000)]
Merge "Revert "TIF: add signal detection feature for HW inputs"" into nyc-dev
am:
b69b5b4a6d
* commit '
b69b5b4a6ddf14ad41de93a46095466858fbdec2':
Revert "TIF: add signal detection feature for HW inputs"
Change-Id: Ib5fd0a8a7133063b14af4a404ea14089bab0c495
Dongwon Kang [Wed, 4 May 2016 17:33:52 +0000 (17:33 +0000)]
Merge "Revert "TIF: add signal detection feature for HW inputs"" into nyc-dev
Sid Soundararajan [Wed, 4 May 2016 17:30:27 +0000 (17:30 +0000)]
Merge "Add a null check for the thumbnail image for transition" into nyc-dev
am:
2ff157c027
* commit '
2ff157c027cb3eb5eddefa39617ec49aeb75a139':
Add a null check for the thumbnail image for transition
Change-Id: I149beb8615e78677e25b07cbf137152165ae38b9
Julia Reynolds [Wed, 4 May 2016 17:30:24 +0000 (17:30 +0000)]
Merge "Uncheck unselected radio buttons." into nyc-dev
am:
69e0d82994
* commit '
69e0d8299460afeea1d33619b341937914a42839':
Uncheck unselected radio buttons.
Change-Id: Ide0a1270da222aadf343829f54074636e7823fc5
Vladislav Kaznacheev [Wed, 4 May 2016 17:30:21 +0000 (17:30 +0000)]
Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev
am:
221c6e6db7
* commit '
221c6e6db77c99351d65db29c432caa077613124':
Fix ClipData JavaDoc and behavior that contradicts JavaDoc
Change-Id: Iddb5bc03bdaeec04336a86d90b9243914ba6c461
Pavel Zhamaitsiak [Wed, 4 May 2016 17:30:17 +0000 (17:30 +0000)]
Merge "Fix race condition in MetricsLoggerService" into nyc-dev
am:
be3e539ff7
* commit '
be3e539ff7b26d497f930fb2faf761e94fa99297':
Fix race condition in MetricsLoggerService
Change-Id: I6c5b3d2b4889bef57ff169199081bdb79b8117e8
Sid Soundararajan [Wed, 4 May 2016 17:14:18 +0000 (17:14 +0000)]
Merge "Add a null check for the thumbnail image for transition" into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 17:09:50 +0000 (17:09 +0000)]
Merge "Uncheck unselected radio buttons." into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 17:07:12 +0000 (17:07 +0000)]
Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev
Steve McKay [Wed, 4 May 2016 17:05:28 +0000 (17:05 +0000)]
Merge "Disable share when dirs selected." into nyc-dev
am:
3fff306827
* commit '
3fff306827c6fe998f8569d71ea18da597eb5a85':
Disable share when dirs selected.
Change-Id: I2dbe0e2081580b5096a60657b5dc35536dc8f873
Vladislav Kaznacheev [Wed, 4 May 2016 17:05:25 +0000 (17:05 +0000)]
Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev
am:
e06ef946f4
* commit '
e06ef946f4f86e11f9a8ed5abe216ef7b76aebf0':
Collect mime type data correctly for all URIs added to ClipData
Change-Id: I6f50e3c880cf7ae6f67f6571cdabe6d68cc1f7c1
Pavel Zhamaitsiak [Wed, 4 May 2016 17:02:16 +0000 (17:02 +0000)]
Merge "Fix race condition in MetricsLoggerService" into nyc-dev
Steve McKay [Wed, 4 May 2016 16:46:18 +0000 (16:46 +0000)]
Merge "Disable share when dirs selected." into nyc-dev
Robin Lee [Wed, 4 May 2016 15:38:06 +0000 (16:38 +0100)]
Start VPN as early as possible during startup
- Switch from USER_STARTING to USER_STARTED which is the foreground
version of the broadcast
- Set the new VPN network as CONNECTING initially to avoid spamming
apps with useless notifications ahead of the network being fully
available
Bug:
26694104
Fix:
28335277
Change-Id: I31d5260dda62ff440c31c44eb0aa5c891e2717e5
TreeHugger Robot [Wed, 4 May 2016 16:41:07 +0000 (16:41 +0000)]
Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev
Robin Lee [Sun, 1 May 2016 22:00:00 +0000 (23:00 +0100)]
Split network agent created state from connected state
Network creation setup sometimes involves extra steps after actually
calling into netd to create the underlying network, rules & routes &
to begin allowing sockets bound to it.
For example, VPN networks can set a UID whitelist or blacklist. This
should happen:
- AFTER there is a netID & network created in netd as
network-specific rules will need to be tied to / point at it. Those
rules are tied to the lifecycle of netd's network which is tracked
by `NetworkAgentInfo.created` on the frameworks side.
- BEFORE the CONNECTED broadcast and network callbacks have been sent
out so that we don't create a race condition between clients that
want to use the network and the server actually having the network
ready
The race condition existed prior to this change and required any client
making use of network callbacks to sleep for a short amount of time after
receiving to actually be able to use the network.
Among other things, that race condition is now fixed.
Bug:
26694104
Change-Id: Ied92f5588a98c3e97f456bc98b676bf201ab5472
Baligh Uddin [Wed, 4 May 2016 14:04:14 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
5282bb5ee7 -s ours
* commit '
5282bb5ee71aa22cd9b943994e7af773730acbed':
Import translations. DO NOT MERGE
Change-Id: I724eef86f050bdd1f8ee9ba9ba1c8d2c302267c2
Baligh Uddin [Wed, 4 May 2016 14:04:10 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
ce7d13e9e6 -s ours
* commit '
ce7d13e9e69a886f3cd5117cc4060a38885b5d10':
Import translations. DO NOT MERGE
Change-Id: I4ca603cdefb3c97bc2544d0e36da7b39453cc2b5
Baligh Uddin [Wed, 4 May 2016 14:04:06 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2799ff8a4b -s ours
* commit '
2799ff8a4b88a7f61978bc186259009915b42b29':
Import translations. DO NOT MERGE
Change-Id: Iea3ea6f375f87f0879577155226a8cb4df9da844
Baligh Uddin [Wed, 4 May 2016 14:04:01 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
151a7bb502 -s ours
* commit '
151a7bb5020a46144d618a30624916eb58446517':
Import translations. DO NOT MERGE
Change-Id: I62cd8e2442fd1ed650685eb1c230535982eb22a4
Baligh Uddin [Wed, 4 May 2016 13:45:10 +0000 (13:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 4 May 2016 13:45:07 +0000 (13:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 4 May 2016 13:42:29 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 4 May 2016 13:42:15 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Felipe Leme [Wed, 4 May 2016 13:37:29 +0000 (13:37 +0000)]
Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev
am:
b5cc6af44f
* commit '
b5cc6af44ff69200c1693975c76d094bd46adb69':
Don't display 1st-time dialog when disabling Data Saver.
Change-Id: I22204829f07d4f430d48b243f3db53c454c2d50e
Julia Reynolds [Fri, 29 Apr 2016 18:32:46 +0000 (14:32 -0400)]
Uncheck unselected radio buttons.
Fixes:
28518097
Change-Id: I22cce7837802a97f15af4170f8991db1685ee121
TreeHugger Robot [Wed, 4 May 2016 13:24:11 +0000 (13:24 +0000)]
Merge "Don't display 1st-time dialog when disabling Data Saver." into nyc-dev
Tim Volodine [Wed, 4 May 2016 12:52:11 +0000 (12:52 +0000)]
Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev
am:
42791eca7d
* commit '
42791eca7dd70a077bca554b708c65794afdde92':
[WebView] Update ServiceWorker related documentation.
Change-Id: I81d317326997b1d550206fa6a0303bb98ef53e56
TreeHugger Robot [Wed, 4 May 2016 12:37:20 +0000 (12:37 +0000)]
Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev
Ricky Wai [Wed, 4 May 2016 10:59:49 +0000 (10:59 +0000)]
Merge "Do not show exception stack trace when no child profile key" into nyc-dev
am:
3423a513e7
* commit '
3423a513e7c0c0a0a7ae0fada1fc684c990c0aa2':
Do not show exception stack trace when no child profile key
Change-Id: I0ef58126daa4ed3ea3e683aecda677c21ee00786
Ricky Wai [Wed, 4 May 2016 10:47:53 +0000 (10:47 +0000)]
Merge "Do not show exception stack trace when no child profile key" into nyc-dev
Ricky Wai [Wed, 4 May 2016 10:41:38 +0000 (10:41 +0000)]
Merge "Make notification reply can response to work challenge" into nyc-dev
am:
92d0e9a4ed
* commit '
92d0e9a4ede2c1b8132d9d980d1e51b2e5558ffb':
Make notification reply can response to work challenge
Change-Id: Ie684a58e8598bcaf9763d282f7624ce81817d6d8
Tony Mak [Wed, 4 May 2016 10:41:15 +0000 (10:41 +0000)]
New settings key and policy transparency for managed profile settings
am:
c820cc5fb1
* commit '
c820cc5fb1eb036e76d60a25f151cbd91485feb3':
New settings key and policy transparency for managed profile settings
Change-Id: Idac0d1357d77c4d740f3978f36e1e56224f66f0b
Ricky Wai [Wed, 4 May 2016 10:11:20 +0000 (10:11 +0000)]
Merge "Make notification reply can response to work challenge" into nyc-dev
Ricky Wai [Tue, 3 May 2016 13:50:03 +0000 (14:50 +0100)]
Do not show exception stack trace when no child profile key
Bug:
28396912
Change-Id: I48e3f3223d04a0ba3dd2d975901b0504ce0dd25f
Tony Mak [Tue, 3 May 2016 17:58:28 +0000 (18:58 +0100)]
New settings key and policy transparency for managed profile settings
Bug:
28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
Baligh Uddin [Wed, 4 May 2016 07:06:46 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: Ic96e78c740e77efbccaee8718e981d6fb9a1da58
Baligh Uddin [Wed, 4 May 2016 06:29:06 +0000 (23:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: Ia8bad7599bc6c36fd2d28e3e1b223ab64c6981ba
Baligh Uddin [Wed, 4 May 2016 06:15:27 +0000 (23:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: If0b1247f6f525c6db0dddb5fa591d7c46bb2fbf0
Baligh Uddin [Wed, 4 May 2016 06:07:15 +0000 (23:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: I0bd21ace6a871d1e74ce5a670acf2f0ed30c12fe
Jeff Sharkey [Wed, 4 May 2016 03:47:36 +0000 (03:47 +0000)]
Merge "Check permission for FLAG_WILL_BE_FOREGROUND." into nyc-dev
am:
564915c58e
* commit '
564915c58e30a1849386f1a77559a461b9f681f4':
Check permission for FLAG_WILL_BE_FOREGROUND.
Change-Id: Id9666e2ce5b61d566f3581b1a02bfd27905883a8
TreeHugger Robot [Wed, 4 May 2016 03:39:27 +0000 (03:39 +0000)]
Merge "Check permission for FLAG_WILL_BE_FOREGROUND." into nyc-dev
Jeff Sharkey [Wed, 4 May 2016 02:08:03 +0000 (02:08 +0000)]
Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev
am:
c8cc38c8c5
* commit '
c8cc38c8c56770dd3ff2a7e2fbb3267c6a9a14d0':
Avoid restart when inserting/ejecting adopted.
Change-Id: If2d05f0f06f76a4df6a2ca476abb5c78095f774f
TreeHugger Robot [Wed, 4 May 2016 02:02:38 +0000 (02:02 +0000)]
Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev
smain@google.com [Wed, 4 May 2016 01:30:07 +0000 (01:30 +0000)]
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434 am:
3548f40a28 am:
e77eefbe29 am:
ad6af19b1b
am:
623620651a
* commit '
623620651ab8fb55898e8af0c499343a427ba6fd':
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434
Change-Id: I7e443489c278549bd06e07c35b0e04a63bc0de78
smain@google.com [Wed, 4 May 2016 01:27:39 +0000 (01:27 +0000)]
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434 am:
3548f40a28 am:
e77eefbe29
am:
ad6af19b1b
* commit '
ad6af19b1b99a9cd5b8f2db6010532f19d38aae2':
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434
Change-Id: Id5ce56f0686ae76278017872ed3ea4b7a7632734
smain@google.com [Wed, 4 May 2016 01:25:01 +0000 (01:25 +0000)]
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434 am:
3548f40a28
am:
e77eefbe29
* commit '
e77eefbe29908d6500c56fc3090be94e097bbb1c':
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434
Change-Id: If29e3ccf695010de01fa50f1a09733b663c9b506
smain@google.com [Wed, 4 May 2016 01:22:25 +0000 (01:22 +0000)]
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434
am:
3548f40a28
* commit '
3548f40a28722750dc581414f329b6741502fb6a':
redirect removed file from cl: https://critique.corp.google.com/#review/
121079434
Change-Id: I232156f7f32292eea6bbbf995921234048d1ca91
smain@google.com [Wed, 4 May 2016 01:14:06 +0000 (18:14 -0700)]
redirect removed file from cl:
https://critique.corp.google.com/#review/
121079434
Change-Id: I5629c3142167e79875d930a272977c4f527203e6
Chris Craik [Wed, 4 May 2016 01:11:10 +0000 (01:11 +0000)]
Merge "Use LUT for computing final shadow alpha" into nyc-dev
am:
b2e36d7939
* commit '
b2e36d7939610de538a6ec95a821b61b365b3073':
Use LUT for computing final shadow alpha
Change-Id: Id29a67b235ccdc48f610c3e4ebbcf62e5cc1590a
TreeHugger Robot [Wed, 4 May 2016 01:03:40 +0000 (01:03 +0000)]
Merge "Use LUT for computing final shadow alpha" into nyc-dev
destradaa [Wed, 4 May 2016 00:48:58 +0000 (00:48 +0000)]
Merge "Update verbosity of hardware providers." into nyc-dev
am:
976b9b04e4
* commit '
976b9b04e4b38c3be2f91d6955e53874ad52cb10':
Update verbosity of hardware providers.
Change-Id: I20c151713e75a714006cb849d86de9d417eafe9c
Steve McKay [Wed, 4 May 2016 00:47:39 +0000 (17:47 -0700)]
Finish selection mode after copyto and share...
actions are picked by user.
Bug:
27601508
Change-Id: I32cbc8e8eb4abba4161309327d5ce730610193ad
Jaewan Kim [Wed, 4 May 2016 00:39:01 +0000 (00:39 +0000)]
Merge "Fix documentation for drawable resource" into mnc-docs am:
2d542c5558 am:
d3eacb56b6 am:
7179b0b52f am:
3c523f65a8
am:
cda3cab8dd
* commit '
cda3cab8dd35f802e8d0ded415545123e5444b38':
Fix documentation for drawable resource
Change-Id: I3512746c54f294342cd5ad9d3c34675d4ef3a23a
Daniel Estrada Alva [Wed, 4 May 2016 00:38:05 +0000 (00:38 +0000)]
Merge "Update verbosity of hardware providers." into nyc-dev
Jaewan Kim [Wed, 4 May 2016 00:34:33 +0000 (00:34 +0000)]
Merge "Fix documentation for drawable resource" into mnc-docs am:
2d542c5558 am:
d3eacb56b6 am:
7179b0b52f
am:
3c523f65a8
* commit '
3c523f65a87f8fd0f30ea41ac205687111b218ea':
Fix documentation for drawable resource
Change-Id: Ia726bfeb247b212fadfb07f6e241295d07f16256
Keisuke Kuroyanagi [Wed, 4 May 2016 00:29:57 +0000 (00:29 +0000)]
Merge "Show drag handles after finishing batch edit if needed." into nyc-dev
am:
be1cd9f5ce
* commit '
be1cd9f5ce6eb2bc37b15258c6ab22e2fc5592e1':
Show drag handles after finishing batch edit if needed.
Change-Id: I6712ca831e924ff52e365e5a5c7c76f3392ee415
Amith Yamasani [Wed, 4 May 2016 00:29:53 +0000 (00:29 +0000)]
Merge "Clear active requests on switching voice interactor" into nyc-dev
am:
ec07352007
* commit '
ec07352007812eeb70c5f47bbac54e9816a30b55':
Clear active requests on switching voice interactor
Change-Id: I45b2a508f74cec72a49eb7c30db03e17831fcc33