242252 Commits

Author SHA1 Message Date
Steve McKay
3fff306827 Merge "Disable share when dirs selected." into nyc-dev 2016-05-04 16:46:30 +00:00
TreeHugger Robot
e06ef946f4 Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 2016-05-04 16:41:08 +00:00
Baligh Uddin
5282bb5ee7 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:13 +00:00
Baligh Uddin
ce7d13e9e6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:09 +00:00
Baligh Uddin
2799ff8a4b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:42:31 +00:00
Baligh Uddin
151a7bb502 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:42:17 +00:00
TreeHugger Robot
b5cc6af44f Merge "Don't display 1st-time dialog when disabling Data Saver." into nyc-dev 2016-05-04 13:24:13 +00:00
TreeHugger Robot
42791eca7d Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 2016-05-04 12:37:21 +00:00
Ricky Wai
3423a513e7 Merge "Do not show exception stack trace when no child profile key" into nyc-dev 2016-05-04 10:47:55 +00:00
Ricky Wai
92d0e9a4ed Merge "Make notification reply can response to work challenge" into nyc-dev 2016-05-04 10:11:21 +00:00
Ricky Wai
de3a068af6 Do not show exception stack trace when no child profile key
Bug: 28396912
Change-Id: I48e3f3223d04a0ba3dd2d975901b0504ce0dd25f
2016-05-04 10:09:50 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
2016-05-04 09:33:08 +00:00
Baligh Uddin
a7558df310 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ic96e78c740e77efbccaee8718e981d6fb9a1da58
2016-05-04 00:06:46 -07:00
Baligh Uddin
7fd9b8c578 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ia8bad7599bc6c36fd2d28e3e1b223ab64c6981ba
2016-05-03 23:29:06 -07:00
Baligh Uddin
3a5ffb25d7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: If0b1247f6f525c6db0dddb5fa591d7c46bb2fbf0
2016-05-03 23:15:27 -07:00
Baligh Uddin
a90acec632 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I0bd21ace6a871d1e74ce5a670acf2f0ed30c12fe
2016-05-03 23:07:15 -07:00
TreeHugger Robot
564915c58e Merge "Check permission for FLAG_WILL_BE_FOREGROUND." into nyc-dev 2016-05-04 03:39:29 +00:00
TreeHugger Robot
c8cc38c8c5 Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev 2016-05-04 02:02:39 +00:00
smain@google.com
623620651a 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
2016-05-04 01:27:39 +00:00
smain@google.com
ad6af19b1b 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
2016-05-04 01:25:01 +00:00
smain@google.com
e77eefbe29 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
2016-05-04 01:22:25 +00:00
smain@google.com
3548f40a28 redirect removed file from cl:
https://critique.corp.google.com/#review/121079434

Change-Id: I5629c3142167e79875d930a272977c4f527203e6
2016-05-03 18:14:06 -07:00
TreeHugger Robot
b2e36d7939 Merge "Use LUT for computing final shadow alpha" into nyc-dev 2016-05-04 01:03:42 +00:00
Daniel Estrada Alva
976b9b04e4 Merge "Update verbosity of hardware providers." into nyc-dev 2016-05-04 00:38:06 +00:00
Jaewan Kim
cda3cab8dd 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
2016-05-04 00:34:33 +00:00
Jaewan Kim
3c523f65a8 Merge "Fix documentation for drawable resource" into mnc-docs am: 2d542c5558 am: d3eacb56b6
am: 7179b0b52f

* commit '7179b0b52f64a5838cc367fea9407ec120b4fd2e':
  Fix documentation for drawable resource

Change-Id: Ic66e603345daf1c915939330a3f4cac52787610e
2016-05-04 00:29:25 +00:00
Jaewan Kim
7179b0b52f Merge "Fix documentation for drawable resource" into mnc-docs am: 2d542c5558
am: d3eacb56b6

* commit 'd3eacb56b6918804ef6c8542fe264656c03f1708':
  Fix documentation for drawable resource

Change-Id: I5d8ca19f0dc24fe054fef9ae339cc9283efdd5d8
2016-05-04 00:25:40 +00:00
Keisuke Kuroyanagi
be1cd9f5ce Merge "Show drag handles after finishing batch edit if needed." into nyc-dev 2016-05-04 00:22:58 +00:00
Jaewan Kim
d3eacb56b6 Merge "Fix documentation for drawable resource" into mnc-docs
am: 2d542c5558

* commit '2d542c555851d896ceecb0e7a51819fef4f2cfbd':
  Fix documentation for drawable resource

Change-Id: Idc27783a9b237dbba23f548ecdde89df32acec8b
2016-05-04 00:16:44 +00:00
TreeHugger Robot
ec07352007 Merge "Clear active requests on switching voice interactor" into nyc-dev 2016-05-04 00:13:30 +00:00
Eric Laurent
29d499a2bd Merge "update doc with permissions needed for voice call capture." into nyc-dev 2016-05-04 00:12:15 +00:00
Jaewan Kim
2d542c5558 Merge "Fix documentation for drawable resource" into mnc-docs 2016-05-04 00:10:39 +00:00
TreeHugger Robot
4fec5fe6ef Merge "Fix wrong import" into nyc-dev 2016-05-03 23:59:57 +00:00
Baligh Uddin
582b69a716 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-03 23:49:17 +00:00
Baligh Uddin
9d8adcbaff Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-03 23:49:13 +00:00
Android Build Merger (Role)
bb198f80a7 Merge "Remove extraneous Training heading that doesn\'t appear in other training indexes. am: e4f02996b5 am: a4a30aaa6c am: e105e8face" into nyc-dev 2016-05-03 23:46:16 +00:00
Dirk Dougherty
7c004c4937 Remove extraneous Training heading that doesn\'t appear in other training indexes. am: e4f02996b5 am: a4a30aaa6c
am: e105e8face

* commit 'e105e8faced5b9528421efc48e4ec26e4f487aae':
  Remove extraneous Training heading that doesn't appear in other training indexes.

Change-Id: I08b98bc4954535cffc0a4307d540f9f8541e5c56
2016-05-03 23:45:29 +00:00
Jeff Sharkey
4f10040f6b Check permission for FLAG_WILL_BE_FOREGROUND.
This flag is only designed to be used by platform internals, such as
DownloadManager, so require that callers hold a nice strong
permission.

Bug: 26571724
Change-Id: Ie5ec55399e2e3a64b2837ef2c0a7a8a79bd1e49f
2016-05-03 17:44:26 -06:00
Dirk Dougherty
e105e8face Remove extraneous Training heading that doesn\'t appear in other training indexes. am: e4f02996b5
am: a4a30aaa6c

* commit 'a4a30aaa6cf49a96c77cd2b74c6b79fdeced0cc4':
  Remove extraneous Training heading that doesn't appear in other training indexes.

Change-Id: I6f15388dc3567edaf89a3968e7deb4cdcffd9b50
2016-05-03 23:42:48 +00:00
Dianne Hackborn
e76ffd19a4 Merge "Work on issue #28200735: AcitvityManagerService lock held for..." into nyc-dev 2016-05-03 23:41:47 +00:00
Jeff Sharkey
379d52be47 Avoid restart when inserting/ejecting adopted.
When rapidly inserting/ejecting an adopted storage device, we might
still be trying to prepare the storage device.  Catch the exception
to avoid a runtime restart, and keep rolling forward, since we'll
probably be handling the ejected event in a few moments to clean up
any packages.

Bug: 28467146
Change-Id: Ib923663ae6d63259c1b5792b68dfe760612ab838
2016-05-03 17:40:22 -06:00
Dirk Dougherty
a4a30aaa6c Remove extraneous Training heading that doesn\'t appear in other training indexes.
am: e4f02996b5

* commit 'e4f02996b50f1b5635f760e8e3240f33365ac3ef':
  Remove extraneous Training heading that doesn't appear in other training indexes.

Change-Id: If03ebec3f7c7404f80458b5dc84cd3fa71830fce
2016-05-03 23:40:18 +00:00
Chong Zhang
66a440a320 Merge "Fix a transparent flicker due to wrong crop" into nyc-dev 2016-05-03 23:37:33 +00:00
Baligh Uddin
8a44c3c8d0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ie10dd0e18292f94995761a098df8c42ee69a0e25
2016-05-03 16:36:29 -07:00
Baligh Uddin
da521ddc53 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I15a9ed4cab9b212c20a05b7fddcb00d74c3172bc
2016-05-03 16:30:12 -07:00
Dirk Dougherty
e4f02996b5 Remove extraneous Training heading that doesn't appear in other training indexes.
Change-Id: I7dfb3cf998e717969747142d1d53b85f85236938
2016-05-03 16:11:00 -07:00
Felipe Leme
ac0dbbbb8a Don't display 1st-time dialog when disabling Data Saver.
BUG: 28098106
Change-Id: Iec6deb45a881fab2896463a59cbc7a96a9e5c811
2016-05-03 15:58:35 -07:00
Steve McKay
9efd34e00c Disable share when dirs selected.
Pass a SelectionDetails object instead of a pile of booleans into updateActionMenu.
Normalized "is feature X enabled" naming.
Normalized menu fiddling in FilesTuner.

Bug: 28467604
Change-Id: Ic88fab78adf02f794ef0c0550443a3c075e7bab6
2016-05-03 15:57:27 -07:00
Vladislav Kaznacheev
067d6fadd9 Collect mime type data correctly for all URIs added to ClipData
Bug: 28452937
Change-Id: I883ae2d22e09000137fa484ef66d5070855cd0ed
2016-05-03 15:53:45 -07:00
Dianne Hackborn
27c279d5c8 Merge "Fix issue #28477006: Add small event log to job scheduler" into nyc-dev 2016-05-03 22:33:54 +00:00