OSDN Git Service
Bill Yi [Fri, 3 Jun 2016 17:59:12 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
10e29e0730 -s ours
* commit '
10e29e0730c21cb8a2cfe74b43792fa3a5705195':
Import translations. DO NOT MERGE
Change-Id: Ic4105391ce9541d9073b45d7c5d69b4e2f2bcae5
Bill Yi [Fri, 3 Jun 2016 17:59:06 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
93bc210b3f -s ours
* commit '
93bc210b3f9e9a86074080324162b3a66cac104c':
Import translations. DO NOT MERGE
Change-Id: Ia8b0a47a38207e1d2c85f97f0e771281512d1e9c
Eino-Ville Talvala [Fri, 3 Jun 2016 17:57:30 +0000 (17:57 +0000)]
Merge "Camera2: Update lensShadingMap documentation" into nyc-dev
am:
cd44a32dfe
* commit '
cd44a32dfe6a5a39db496af6de7764e164cda6f5':
Camera2: Update lensShadingMap documentation
Change-Id: If6a354fb827e650e97be7023ba9e44058a415b63
TreeHugger Robot [Fri, 3 Jun 2016 17:54:20 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:53:25 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Eino-Ville Talvala [Fri, 3 Jun 2016 17:51:17 +0000 (17:51 +0000)]
Merge "Camera2: Update lensShadingMap documentation" into nyc-dev
Sudheer Shanka [Fri, 3 Jun 2016 17:13:03 +0000 (17:13 +0000)]
Merge "Avoid triggering support dialog in non-current user." into nyc-dev
am:
5548733eb5
* commit '
5548733eb5163ef9f3c642314d2d217503c90d64':
Avoid triggering support dialog in non-current user.
Change-Id: I243f2699a5840294e0de9efc5e95011fd83dca37
Bill Yi [Fri, 3 Jun 2016 17:12:46 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
237b52f40c -s ours
* commit '
237b52f40c5564a54a1073df6e77f6da93cdab12':
Import translations. DO NOT MERGE
Change-Id: I6155b21e15e89da4d6a5234a89b7dac3ac005099
Bill Yi [Fri, 3 Jun 2016 17:12:42 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
31cd8615b2 -s ours
* commit '
31cd8615b2cd7cf04e00a87c7981264c1b180356':
Import translations. DO NOT MERGE
Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508
Bill Yi [Fri, 3 Jun 2016 17:12:38 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
52edfafb9c -s ours
* commit '
52edfafb9c53d14a5e1de1ecdd3d5b735cecf711':
Import translations. DO NOT MERGE
Change-Id: I4ef01eea310877c5201b9c2e44c9f49948aeb1f1
Bill Yi [Fri, 3 Jun 2016 17:12:33 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f79616b427 -s ours
* commit '
f79616b4277f477985f96f8a486126a389905c7d':
Import translations. DO NOT MERGE
Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f
Bill Yi [Fri, 3 Jun 2016 17:04:14 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a68d1f10e2 -s ours
* commit '
a68d1f10e2c20e128215406b4d6f4fb835481324':
Import translations. DO NOT MERGE
Change-Id: Ic08e6e8dcb28ab89c072abe20633c71d7695277e
Bill Yi [Fri, 3 Jun 2016 17:04:08 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2130b28754 -s ours
* commit '
2130b287549b010b405bc72d04f07fb1bd070ba5':
Import translations. DO NOT MERGE
Change-Id: Ib9e163aa0e74fdd6c9b22c292e9651d153e117a4
Bill Yi [Fri, 3 Jun 2016 17:04:02 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
ef2989920d -s ours
* commit '
ef2989920d00f19d5dcd86bd521eec86bc058754':
Import translations. DO NOT MERGE
Change-Id: I4c4da499fab8a30733235849a336876442e46125
Bill Yi [Fri, 3 Jun 2016 17:03:59 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
3d9d9fa0d9 -s ours
* commit '
3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
Import translations. DO NOT MERGE
Change-Id: I02a8d1407296ab018dab851a235fce0c8c75013c
Bill Yi [Fri, 3 Jun 2016 17:03:50 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cace07e727 -s ours
* commit '
cace07e7271723232277e8dfe94799c80926c5ea':
Import translations. DO NOT MERGE
Change-Id: I7b6473f40f64a17b4f7417cf28c1e24d36a9c3ff
TreeHugger Robot [Fri, 3 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Avoid triggering support dialog in non-current user." into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:00:22 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:58:49 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:58:26 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:49 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:15 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:56 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:01 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:54:39 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:12 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 16:33:00 +0000 (09:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie630e761cacbec55840a3de9439aa36835a34b38
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 16:16:16 +0000 (09:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84e7cf1ca696555a2af6838dcae6a32df4503822
Auto-generated-cl: translation import
Adrian Roos [Fri, 3 Jun 2016 15:53:09 +0000 (15:53 +0000)]
Merge "Fix BigText transitions" into nyc-dev
am:
2ab4f451dc
* commit '
2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
TreeHugger Robot [Fri, 3 Jun 2016 15:36:10 +0000 (15:36 +0000)]
Merge "Fix BigText transitions" into nyc-dev
Sudheer Shanka [Thu, 2 Jun 2016 19:41:42 +0000 (12:41 -0700)]
Avoid triggering support dialog in non-current user.
Bug:
28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617
Julia Reynolds [Fri, 3 Jun 2016 13:33:11 +0000 (13:33 +0000)]
Don\'t leak guts.
am:
cdf98e1964
* commit '
cdf98e1964489916c68e240bd92c2e0bedab3c2d':
Don't leak guts.
Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
Julia Reynolds [Thu, 2 Jun 2016 20:04:56 +0000 (16:04 -0400)]
Don't leak guts.
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes:
29064258
Bill Yi [Fri, 3 Jun 2016 13:04:14 +0000 (06:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2fd4e7683d9c10652bacfc820593e07bd58cefc0
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 12:23:35 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:52:48 +0000 (04:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic52f441a17948a9d117126b1e808d05535cc558d
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:38:00 +0000 (04:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I680d494c4670c1ae92902559bf88849f043ba501
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:27:06 +0000 (04:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2bf24aac1ece07f78ad462b670824b85945b72f0
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:02:53 +0000 (04:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10d88a14b6477e7ba128653756a84c56ea5034c3
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 10:46:06 +0000 (03:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc14a8e231354fe8cbe65f22761236006de64ce5
Auto-generated-cl: translation import
Tony Mak [Fri, 3 Jun 2016 10:43:37 +0000 (10:43 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am:
33d03a9e43
* commit '
33d03a9e435eb474e3bdd3e958943e0057866477':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
Bill Yi [Fri, 3 Jun 2016 10:38:40 +0000 (03:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic23e11859d0b00fba56d8a3c93afbf86d139bcb4
Auto-generated-cl: translation import
Tony Mak [Thu, 2 Jun 2016 14:01:16 +0000 (15:01 +0100)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.
Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.
Bug:
29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
Bill Yi [Fri, 3 Jun 2016 04:18:31 +0000 (21:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08aeb7a5fb63ed7d10a218d86365331c2ba02b4e
Auto-generated-cl: translation import
Eric Schmidt [Fri, 3 Jun 2016 03:06:49 +0000 (03:06 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d
am:
9ad88ce3fe
* commit '
9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
docs: Fixed background optmizations code snippet
Change-Id: Ib5aeb12e19841f86c8d625d4ea2b1a3f0df4e766
Eric Schmidt [Fri, 3 Jun 2016 02:59:57 +0000 (02:59 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8
am:
76297d719d
* commit '
76297d719d5bbe2dcce65c357591c22b1a1d3293':
docs: Fixed background optmizations code snippet
Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
Eric Schmidt [Fri, 3 Jun 2016 02:52:51 +0000 (02:52 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
am:
0b8eb8c1e8
* commit '
0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
docs: Fixed background optmizations code snippet
Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
Eric Schmidt [Fri, 3 Jun 2016 02:41:45 +0000 (02:41 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
Andrii Kulian [Fri, 3 Jun 2016 02:07:11 +0000 (02:07 +0000)]
Merge "Fix task selection logic" into nyc-dev
am:
265bd89c3c
* commit '
265bd89c3cb6f99d38d2f126a88c12fc6502431c':
Fix task selection logic
Change-Id: If3b8b7d80885b7e5573b03f83f2cb31cfc0e6670
Andrii Kulian [Fri, 3 Jun 2016 01:37:50 +0000 (01:37 +0000)]
Merge "Fix task selection logic" into nyc-dev
Pavlin Radoslavov [Fri, 3 Jun 2016 01:00:34 +0000 (01:00 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
am:
0bc61eb176
* commit '
0bc61eb176644e243b0e131a29a5f66a4303d9b0':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I8953c12b4df0a60bd3649a055a4dbe03c93534e5
Pankaj Kanwar [Fri, 3 Jun 2016 00:55:48 +0000 (00:55 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
Sanket Padawe [Thu, 2 Jun 2016 23:15:57 +0000 (23:15 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
am:
b68601d247
* commit '
b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
Add carrier config variables for overriding carrier name from carrierconf.
Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
Sanket Padawe [Thu, 2 Jun 2016 23:11:21 +0000 (23:11 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
Svetoslav Ganov [Thu, 2 Jun 2016 22:43:41 +0000 (22:43 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
am:
e34bb5a1ff
* commit '
e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
Properly set default voice interactor
Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
Philip P. Moltmann [Thu, 2 Jun 2016 22:37:22 +0000 (22:37 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
am:
5d6a4f582e
* commit '
5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
Do not rotate PDFPrinter pages.
Change-Id: I1f24415c1f7245f5bee5fb24f7d642c0e22a3bdd
Svetoslav Ganov [Thu, 2 Jun 2016 22:36:04 +0000 (22:36 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
Svetoslav Ganov [Thu, 2 Jun 2016 22:25:12 +0000 (15:25 -0700)]
Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.
bug:
28963642
Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
Jorim Jaggi [Thu, 2 Jun 2016 22:19:12 +0000 (22:19 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
am:
6321f42fbe
* commit '
6321f42fbee425745de9636d45e4973fa6c470b9':
Fix unminimizing dock stack for AppTask.moveToFront
Change-Id: I8cb3702db22d24de2aa64360e8e22577f320d00d
Billy Lamberta [Thu, 2 Jun 2016 22:10:08 +0000 (22:10 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c am:
84903c24ed
am:
a092b6cdb9
* commit '
a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
docs: work minisite post-launch fixes
Change-Id: I39f4ea830be553013e8c9ce7989581b31fcbd994
TreeHugger Robot [Thu, 2 Jun 2016 22:08:14 +0000 (22:08 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
Billy Lamberta [Thu, 2 Jun 2016 22:04:13 +0000 (22:04 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c
am:
84903c24ed
* commit '
84903c24ed74c75a2217648a96931cc3045143ea':
docs: work minisite post-launch fixes
Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
Billy Lamberta [Thu, 2 Jun 2016 21:59:29 +0000 (21:59 +0000)]
docs: work minisite post-launch fixes
am:
9fec73a47c
* commit '
9fec73a47c158df0a184a1f2a0301b6394cfec40':
docs: work minisite post-launch fixes
Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.
Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.
Bug:
17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
Andrii Kulian [Thu, 2 Jun 2016 20:18:01 +0000 (13:18 -0700)]
Fix task selection logic
When task was selected for activity launched with flag FLAG_ACTIVITY_NEW_TASK
first matching task was omitted if there was another match lower in stack.
This lead to task shuffling in same stack.
Bug:
28848683
Change-Id: I94e55693fc7ed926fc151ba988d257bd2417dd45
Philip P. Moltmann [Thu, 2 Jun 2016 21:25:33 +0000 (21:25 +0000)]
Merge "Move Xerox recommendation plugin to service." into nyc-dev
am:
e509dcb43f
* commit '
e509dcb43fdbd949b18622a1dee7b9d7373dbabf':
Move Xerox recommendation plugin to service.
Change-Id: I255f9f21bdcc97b2a53fddd276ae71233b8d3193
Eino-Ville Talvala [Thu, 2 Jun 2016 21:21:27 +0000 (14:21 -0700)]
Camera2: Update lensShadingMap documentation
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to camera
device-processed data.
Also fix a few other wording issues in the lens shading documentation.
Bug:
18175853
Change-Id: I27691925e6496afe18f3506084d89f2523b5555d
Philip P. Moltmann [Thu, 2 Jun 2016 21:18:06 +0000 (21:18 +0000)]
Merge "Move Xerox recommendation plugin to service." into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 21:14:34 +0000 (21:14 +0000)]
Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
am:
30e434a996
* commit '
30e434a996e0053eeeeb41f6a198f3945055445b':
Fix memory leak via ZenModeController callbacks.
Change-Id: I7d8702f3761ed71b1c06f1eedaa5740cfc2e799e
Chong Zhang [Thu, 2 Jun 2016 21:06:00 +0000 (21:06 +0000)]
Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
am:
b1e24209f1
* commit '
b1e24209f16621fd095dacb615364bfd15dfe721':
Fix scroll amount calculation in ViewRootImpl
Change-Id: Idb326fa8e459aaf3a97d841c91b3ccefc48dad81
TreeHugger Robot [Thu, 2 Jun 2016 21:05:55 +0000 (21:05 +0000)]
Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
Chong Zhang [Thu, 2 Jun 2016 20:58:05 +0000 (20:58 +0000)]
Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
Philip P. Moltmann [Tue, 31 May 2016 23:29:25 +0000 (16:29 -0700)]
Do not rotate PDFPrinter pages.
- applyPrintAttributes is only used by PDFPrinter
Fixes:
29057330
Change-Id: I883cc64039f4ca2c93810e99d758f2dceec67a8b
Christopher Tate [Thu, 2 Jun 2016 20:49:27 +0000 (20:49 +0000)]
Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am:
453951d077
* commit '
453951d0777b1421e95bbcac501fb8b091c0f6a3':
Don't back up/restore the "automatically restore app data" setting
Change-Id: Ia04215f6597dc3221bda438feb4921d53c1725fc
Chris Tate [Thu, 2 Jun 2016 20:45:14 +0000 (20:45 +0000)]
Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev
Chong Zhang [Thu, 2 Jun 2016 19:56:54 +0000 (12:56 -0700)]
Fix scroll amount calculation in ViewRootImpl
When calculating scroll amount, we should check whehter focus
is visible using before-scrolling position.
It's possible that the view is already scrolled, then visible
insets changes (eg. IME went away). Previous scroll position
still makes the focus visible, but it will leave the focus
in a bad position when it should be scrolled back.
bug:
29025892
Change-Id: I091f16bebc4c1e5ba831616c51ab2ac75d4c4b3c
Adrian Roos [Thu, 2 Jun 2016 20:15:09 +0000 (13:15 -0700)]
Fix BigText transitions
Fixes a bug where BigText would never transition
between the expanded and collapsed version because
padding was wrongly taken into account when checking
the view height.
Change-Id: I4df242b4133dacdff77b78cc2d4ff3954b75b8a7
Fixes:
29042222
Billy Lamberta [Thu, 19 May 2016 21:27:49 +0000 (14:27 -0700)]
docs: work minisite post-launch fixes
* Localization for table of contents.
* Replace occurrences of 'app restrictions' with the preferred
term 'managed configurations' (see go/afw-words). Update resource
card titles and add page redirects.
* In guide, update language for SSO with Chrome Custom Tabs.
(Cherry-picked from
1056063.)
* Add resource card for 'Your Apps at Work' video.
bug:
28378252,
27744376
Change-Id: I8bc2e87d0486159bdd6680600b783af7334c3a58
Jorim Jaggi [Thu, 2 Jun 2016 19:45:09 +0000 (19:45 +0000)]
Merge "Also update setMinLines" into nyc-dev
am:
79c0b2bcbb
* commit '
79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
Also update setMinLines
Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
Jorim Jaggi [Thu, 2 Jun 2016 19:34:56 +0000 (19:34 +0000)]
Merge "Also update setMinLines" into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:31:11 +0000 (19:31 +0000)]
Merge "Fix leak on density change." into nyc-dev
am:
a31ac7ddfb
* commit '
a31ac7ddfbccdb602aebb05686fcdb582ba74752':
Fix leak on density change.
Change-Id: I8c474e29100543668a2348baca5f34b868cf8893
Julia Reynolds [Thu, 2 Jun 2016 19:30:52 +0000 (19:30 +0000)]
Merge "Hide alarm condition if there\'s no alarm." into nyc-dev
am:
62716a9197
* commit '
62716a9197ba77b349d74770e6cd3b114e5f5de7':
Hide alarm condition if there's no alarm.
Change-Id: Ib6c339aa3d00639fcad3bc15791787a52010a84f
Julia Reynolds [Thu, 2 Jun 2016 19:29:16 +0000 (15:29 -0400)]
Fix memory leak via ZenModeController callbacks.
Bug:
29064258
Change-Id: Ie817ec50206ce23561775fc0ac178754b946f030
TreeHugger Robot [Thu, 2 Jun 2016 19:24:15 +0000 (19:24 +0000)]
Merge "Fix leak on density change." into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:22:35 +0000 (19:22 +0000)]
Merge "Hide alarm condition if there's no alarm." into nyc-dev
Jorim Jaggi [Thu, 2 Jun 2016 01:57:54 +0000 (18:57 -0700)]
Fix unminimizing dock stack for AppTask.moveToFront
Some apps call AppTask.moveToFront instead of startActivity from
their trampoline activity. We need to handle this case also and
need to do all the post processing after starting an activity
so the docked stack gets unminimized.
Change-Id: I8400995bf1d1a4a4467d01fd55fca7e5800b4645
Fixes:
28722017
Dianne Hackborn [Thu, 2 Jun 2016 18:49:29 +0000 (18:49 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
am:
5a6cf3ac9a
* commit '
5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
Work on issue #
29042642: Watchdog going off
Change-Id: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
Dianne Hackborn [Thu, 2 Jun 2016 18:31:15 +0000 (18:31 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 18:04:31 +0000 (14:04 -0400)]
Hide alarm condition if there's no alarm.
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes:
27698976
David Brazdil [Thu, 2 Jun 2016 16:21:27 +0000 (16:21 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
am:
c4f1bc4032
* commit '
c4f1bc40326c10fde55f07230e3fe3067d70fbfa':
Do not update packages in encrypted state
Change-Id: Icdba2e72de1dbc284780df7f59cbdc56ff061ba1
David Brazdil [Thu, 2 Jun 2016 16:16:25 +0000 (16:16 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
Mady Mellor [Thu, 2 Jun 2016 16:14:53 +0000 (16:14 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
am:
09ca7e73c0
* commit '
09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
Parent notifications should always be normal notification color
Change-Id: I581aed7e42200d5b78a5e7ac396c76eed883450c
Mady Mellor [Thu, 2 Jun 2016 16:09:15 +0000 (16:09 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:02:56 +0000 (16:02 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
am:
2002061f34
* commit '
2002061f349edfbf583b115af647f0ca34cf749e':
Only reset global restriction owner on DO->PO for the right user
Change-Id: Ifb8b333ff367cbcd24333e3b46aa060060b384ed
TreeHugger Robot [Thu, 2 Jun 2016 15:59:23 +0000 (15:59 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
Selim Cinek [Thu, 2 Jun 2016 15:47:45 +0000 (15:47 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
am:
8e2a2fa98c
* commit '
8e2a2fa98c9ca077681acf13abfb6252c3859e0f':
Fixed that volume buttons were not working on the pin input
Change-Id: I6deb8c3a706c69bebeb29f46aab10c32f8f705af
Selim Cinek [Thu, 2 Jun 2016 15:47:41 +0000 (15:47 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
am:
c152dacc37
* commit '
c152dacc37bd850b06a37e18fba77308e8c9f939':
Fixed a crash with notification groups
Change-Id: I6b76008e357e6459abc2775f992d95bd6a706e68
TreeHugger Robot [Thu, 2 Jun 2016 15:41:19 +0000 (15:41 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:41:08 +0000 (15:41 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
OSDN Git Service
