OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "TIF: Be consistent with argument name for startRecording" into nyc-dev
Dongwon Kang [Mon, 25 Apr 2016 20:33:09 +0000 (20:33 +0000)]
Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev
am: 0751a83

* commit '0751a83a99dc4481533ed706a942b8bb9caf8834':
  TIF: Be consistent with argument name for startRecording

Change-Id: I0701d1e106c57f310e30c65bc178c5b6b4e7344a

8 years agoMerge "API changes for DownloadManager and JobScheduler." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 20:33:07 +0000 (20:33 +0000)]
Merge "API changes for DownloadManager and JobScheduler." into nyc-dev
am: c79a568

* commit 'c79a568f18dde1590d361989ff0cb6b19a61b2e9':
  API changes for DownloadManager and JobScheduler.

Change-Id: I67bf3af62fdc61cb603fd362e6e361aeee85b439

8 years agoMerge "Removing extraneous field from batterystats dumpsys." into nyc-dev
Kweku Adams [Mon, 25 Apr 2016 20:33:05 +0000 (20:33 +0000)]
Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev
am: 3cabb2a

* commit '3cabb2a6b3ae1c120a56cc4c2eaf2ba853cb3e32':
  Removing extraneous field from batterystats dumpsys.

Change-Id: Ice80b3d9fce92c90d9cda3908c1e628d6bf7dde8

8 years agoMerge "TIF: Be consistent with argument name for startRecording" into nyc-dev
Dongwon Kang [Mon, 25 Apr 2016 20:16:21 +0000 (20:16 +0000)]
Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev

8 years agoTIF: Be consistent with argument name for startRecording
Dongwon Kang [Fri, 22 Apr 2016 18:00:03 +0000 (11:00 -0700)]
TIF: Be consistent with argument name for startRecording

Change-Id: Icb0125049cc92c5664e0810cdb86f1cb0903405f

8 years agoMerge "API changes for DownloadManager and JobScheduler." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 20:14:57 +0000 (20:14 +0000)]
Merge "API changes for DownloadManager and JobScheduler." into nyc-dev

8 years agoMerge "Removing extraneous field from batterystats dumpsys." into nyc-dev
Kweku Adams [Mon, 25 Apr 2016 20:09:39 +0000 (20:09 +0000)]
Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev

8 years agoMerge "Fix stuck windows in multi-window" into nyc-dev
Jorim Jaggi [Mon, 25 Apr 2016 19:48:32 +0000 (19:48 +0000)]
Merge "Fix stuck windows in multi-window" into nyc-dev
am: 4a96538

* commit '4a9653841b9a011c6c2dc2a841ef21bb501602ad':
  Fix stuck windows in multi-window

Change-Id: I7618c6852b03ca12887fbc9761839b42428b3a50

8 years agoMerge "Fix layout for child windows" into nyc-dev
Jorim Jaggi [Mon, 25 Apr 2016 19:34:44 +0000 (19:34 +0000)]
Merge "Fix layout for child windows" into nyc-dev
am: 17178d9

* commit '17178d95f2d324f4a74e5572ae403ecc58f65e40':
  Fix layout for child windows

Change-Id: I279c8b4b4686d6d9092fbbccb04dbacb13367b92

8 years agoMerge changes from topic \'substitute-notification-app-name\' into nyc-dev
Dan Sandler [Mon, 25 Apr 2016 19:34:42 +0000 (19:34 +0000)]
Merge changes from topic \'substitute-notification-app-name\' into nyc-dev
am: 955009f

* commit '955009f9d384d1b19ebb441814ca0a3fac0fbc47':
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.

Change-Id: Ic0b4b2460c11426c3e6b529baec3ddd3db0a6f0a

8 years agoMerge "Tap, don\'t touch." into nyc-dev
Dan Sandler [Mon, 25 Apr 2016 19:34:39 +0000 (19:34 +0000)]
Merge "Tap, don\'t touch." into nyc-dev
am: 4c40888

* commit '4c40888673752552380d66bb9b47e230816f6fb5':
  Tap, don't touch.

Change-Id: I044914c79c6214da96342fc76cd6d0636171dc43

8 years agoMerge "Don\'t generate stack in logcat if assistant missing." into nyc-dev
Dan Sandler [Mon, 25 Apr 2016 19:34:34 +0000 (19:34 +0000)]
Merge "Don\'t generate stack in logcat if assistant missing." into nyc-dev
am: 5602898

* commit '5602898dd5e9595dde59377fbad5b2beeee46510':
  Don't generate stack in logcat if assistant missing.

Change-Id: I463db9fd2e78419e1bbf3dcfddc08c294fa27ccb

8 years agoMerge "Fix stuck windows in multi-window" into nyc-dev
Jorim Jaggi [Mon, 25 Apr 2016 19:33:38 +0000 (19:33 +0000)]
Merge "Fix stuck windows in multi-window" into nyc-dev

8 years agoFix stuck windows in multi-window
Jorim Jaggi [Sat, 23 Apr 2016 02:50:13 +0000 (19:50 -0700)]
Fix stuck windows in multi-window

Window manager checked for the full display size so isHiddenFromUserLocked
always returned true but activity manager and other places in window manager
thought it would be visible which created a really weird state.

Bug: 28344326
Change-Id: I98daefbcc64bf7a5196588c25d2cbc5ee046a77d

8 years agoMerge "Fix layout for child windows" into nyc-dev
Jorim Jaggi [Mon, 25 Apr 2016 19:29:39 +0000 (19:29 +0000)]
Merge "Fix layout for child windows" into nyc-dev

8 years agoFix layout for child windows
Jorim Jaggi [Fri, 22 Apr 2016 22:05:50 +0000 (15:05 -0700)]
Fix layout for child windows

Turns out that we also need to fit child windows to display in all
cases except NO_LIMITS is set.

Bug: 27991404
Change-Id: I34a12bbf9d0169bdb770e0e96f4b994146063e90

8 years agoMerge "Fix NPE when assist data request times out" into nyc-dev
Amith Yamasani [Mon, 25 Apr 2016 19:23:49 +0000 (19:23 +0000)]
Merge "Fix NPE when assist data request times out" into nyc-dev
am: bc6d96e

* commit 'bc6d96e4d09ec71a2844ea4e9281b7e849a00f80':
  Fix NPE when assist data request times out

Change-Id: Ifb20aa2e1f246dacff008f539fce728c18abf14b

8 years agoMerge changes from topic 'substitute-notification-app-name' into nyc-dev
Daniel Sandler [Mon, 25 Apr 2016 19:22:38 +0000 (19:22 +0000)]
Merge changes from topic 'substitute-notification-app-name' into nyc-dev

* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.

8 years agoMerge "Tap, don't touch." into nyc-dev
Daniel Sandler [Mon, 25 Apr 2016 19:21:44 +0000 (19:21 +0000)]
Merge "Tap, don't touch." into nyc-dev

8 years agoMerge "Don't generate stack in logcat if assistant missing." into nyc-dev
Daniel Sandler [Mon, 25 Apr 2016 19:21:01 +0000 (19:21 +0000)]
Merge "Don't generate stack in logcat if assistant missing." into nyc-dev

8 years agoMerge "Fix gear being covered on notification update" into nyc-dev
Mady Mellor [Mon, 25 Apr 2016 19:13:03 +0000 (19:13 +0000)]
Merge "Fix gear being covered on notification update" into nyc-dev
am: 904a39c

* commit '904a39ca92f7e616d400a8733b3970b8828da072':
  Fix gear being covered on notification update

Change-Id: I4c6110c40aeff0dec30269d6117def1e0581dab2

8 years agoMerge "Fix the gear so that it is always centered based on the min noti height" into...
Mady Mellor [Mon, 25 Apr 2016 19:13:02 +0000 (19:13 +0000)]
Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev
am: 5a3e441

* commit '5a3e4411582b1cae9b9002026b467c9c08e69a55':
  Fix the gear so that it is always centered based on the min noti height

Change-Id: I4ffb1bc658323392723fecd53179b0edb9140f6d

8 years agoMerge "Added a \'deferred\' parameter on executeRunnableDismissingKeyguard()." into...
Felipe Leme [Mon, 25 Apr 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Added a \'deferred\' parameter on executeRunnableDismissingKeyguard()." into nyc-dev
am: 73624af

* commit '73624af552ac0bfdcd60d5cb3de0e56b8be878a2':
  Added a 'deferred' parameter on executeRunnableDismissingKeyguard().

Change-Id: I92dfafdc192139536dbedc365444a80a92db5028

8 years agoMerge "Fix NPE when assist data request times out" into nyc-dev
Amith Yamasani [Mon, 25 Apr 2016 19:07:30 +0000 (19:07 +0000)]
Merge "Fix NPE when assist data request times out" into nyc-dev

8 years agoMerge "Fix gear being covered on notification update" into nyc-dev
Mady Mellor [Mon, 25 Apr 2016 19:06:16 +0000 (19:06 +0000)]
Merge "Fix gear being covered on notification update" into nyc-dev

8 years agoMerge "Fix the gear so that it is always centered based on the min noti height" into...
Mady Mellor [Mon, 25 Apr 2016 19:05:47 +0000 (19:05 +0000)]
Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev

8 years agoMerge "Added a 'deferred' parameter on executeRunnableDismissingKeyguard()." into...
TreeHugger Robot [Mon, 25 Apr 2016 18:57:29 +0000 (18:57 +0000)]
Merge "Added a 'deferred' parameter on executeRunnableDismissingKeyguard()." into nyc-dev

8 years agoMerge "WebView doc: explain persist js across navigations" into nyc-dev
Bo Liu [Mon, 25 Apr 2016 18:46:49 +0000 (18:46 +0000)]
Merge "WebView doc: explain persist js across navigations" into nyc-dev
am: b698fc9

* commit 'b698fc9d84cff493ce34dd9860f14f34ce48e8f0':
  WebView doc: explain persist js across navigations

Change-Id: I6c5a3b1b4bd78014d7d9b6cc32ddc88128e33de2

8 years agoMerge "WebView doc: explain persist js across navigations" into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 18:39:45 +0000 (18:39 +0000)]
Merge "WebView doc: explain persist js across navigations" into nyc-dev

8 years agoMerge "Add back protected profile availibility broadcasts." into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 18:09:34 +0000 (18:09 +0000)]
Merge "Add back protected profile availibility broadcasts." into nyc-dev
am: cda5089

* commit 'cda50893b623f19834114eb225d78fceb70b8aca':
  Add back protected profile availibility broadcasts.

Change-Id: I64cb4f8be388dbadf607d19d64e4072df03ba7d2

8 years agoMerge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into...
Wale Ogunwale [Mon, 25 Apr 2016 17:58:56 +0000 (17:58 +0000)]
Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev
am: 442fd2a

* commit '442fd2a1ddcfde18887ae712649695d6e7c384b3':
  Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK

Change-Id: I505031cfb8fa177ef968dfe2a4170e31542147ec

8 years agoMerge "Added the ripple drawable back to the media notification" into nyc-dev
Selim Cinek [Mon, 25 Apr 2016 17:58:55 +0000 (17:58 +0000)]
Merge "Added the ripple drawable back to the media notification" into nyc-dev
am: 08b38f8

* commit '08b38f87ef297ed792f25041e10d036eb6f58c82':
  Added the ripple drawable back to the media notification

Change-Id: Iac5eb83358ebb03f4858c2dfe74ca761a9c77396

8 years agoMerge "Add back protected profile availibility broadcasts." into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 17:58:28 +0000 (17:58 +0000)]
Merge "Add back protected profile availibility broadcasts." into nyc-dev

8 years agoMerge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into...
TreeHugger Robot [Mon, 25 Apr 2016 17:51:12 +0000 (17:51 +0000)]
Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev

8 years agoAdd back protected profile availibility broadcasts.
Rubin Xu [Mon, 25 Apr 2016 17:47:36 +0000 (18:47 +0100)]
Add back protected profile availibility broadcasts.

Bug: 27532254
Change-Id: Ifbf59f64358864cd1d48be5e797c45ec2744eac0

8 years agoMerge "Added the ripple drawable back to the media notification" into nyc-dev
Selim Cinek [Mon, 25 Apr 2016 17:44:10 +0000 (17:44 +0000)]
Merge "Added the ripple drawable back to the media notification" into nyc-dev

8 years agoRemoving extraneous field from batterystats dumpsys.
Kweku Adams [Mon, 25 Apr 2016 17:44:05 +0000 (10:44 -0700)]
Removing extraneous field from batterystats dumpsys.

Accidentally introduced in ag/851920.

Change-Id: I89ac490cef1735defa7165e6d27beae20490091d

8 years agoFix NPE when assist data request times out
Amith Yamasani [Mon, 25 Apr 2016 17:24:52 +0000 (10:24 -0700)]
Fix NPE when assist data request times out

Bug: 28329835
Change-Id: I032e20ea1008512954b97519a4abb6fe4d65c673

8 years agoMerge "fix "am start -W" hang on activity start" into nyc-dev
Chong Zhang [Mon, 25 Apr 2016 17:16:47 +0000 (17:16 +0000)]
Merge "fix "am start -W" hang on activity start" into nyc-dev
am: 5e40748

* commit '5e40748d3f32c0d5843855cac169e82dd15a0904':
  fix "am start -W" hang on activity start

Change-Id: I1b588c6ccd369d05afca0729d79a3102226aeff9

8 years agoMerge "Return null when user is locked" into nyc-dev
Fyodor Kupolov [Mon, 25 Apr 2016 17:16:45 +0000 (17:16 +0000)]
Merge "Return null when user is locked" into nyc-dev
am: 6eb8c15

* commit '6eb8c15b7e07e320243fbb34999f4a34fa729ed0':
  Return null when user is locked

Change-Id: I7926a4226ce99d290ba60fff85b72f4a2f3cf6f3

8 years agoMerge "Strings for post-upgrade." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 17:16:43 +0000 (17:16 +0000)]
Merge "Strings for post-upgrade." into nyc-dev
am: 5dc3304

* commit '5dc3304531b7612f1181e122a66eaf097339ae30':
  Strings for post-upgrade.

Change-Id: I6ccbf0118dd602cdb94c11085a4c45fb6b248856

8 years agoMerge "Fixing animation regression due to ag/957220." into nyc-dev
Winson [Mon, 25 Apr 2016 17:16:41 +0000 (17:16 +0000)]
Merge "Fixing animation regression due to ag/957220." into nyc-dev
am: de91709

* commit 'de91709935b687cf747b25a48d22e9aa396bf462':
  Fixing animation regression due to ag/957220.

Change-Id: Ib0bc962b9e789227fed652517dff63ca00e0acc6

8 years agoMerge "Disable StrictMode policy when setting up profile support" into nyc-dev
Calin Juravle [Mon, 25 Apr 2016 17:16:38 +0000 (17:16 +0000)]
Merge "Disable StrictMode policy when setting up profile support" into nyc-dev
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
  Disable StrictMode policy when setting up profile support

Change-Id: I2fa44b42bf2d5a3dd649ac75f032f0ebb79d3422

8 years agoMerge "fix "am start -W" hang on activity start" into nyc-dev
Chong Zhang [Mon, 25 Apr 2016 17:08:05 +0000 (17:08 +0000)]
Merge "fix "am start -W" hang on activity start" into nyc-dev

8 years agoMerge "Return null when user is locked" into nyc-dev
Fyodor Kupolov [Mon, 25 Apr 2016 17:03:34 +0000 (17:03 +0000)]
Merge "Return null when user is locked" into nyc-dev

8 years agoWebView doc: explain persist js across navigations
Bo Liu [Fri, 22 Apr 2016 23:23:22 +0000 (16:23 -0700)]
WebView doc: explain persist js across navigations

BUG: 28207652
Change-Id: Ib33f029c2cae6c1482c0c951075275e9f96ae73c

8 years agoMerge "Strings for post-upgrade." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 16:34:11 +0000 (16:34 +0000)]
Merge "Strings for post-upgrade." into nyc-dev

8 years agoMerge "Fixing animation regression due to ag/957220." into nyc-dev
Winson Chung [Mon, 25 Apr 2016 16:25:49 +0000 (16:25 +0000)]
Merge "Fixing animation regression due to ag/957220." into nyc-dev

8 years agoAdded a 'deferred' parameter on executeRunnableDismissingKeyguard().
Felipe Leme [Fri, 22 Apr 2016 23:11:19 +0000 (16:11 -0700)]
Added a 'deferred' parameter on executeRunnableDismissingKeyguard().

OnDismissAction() should return true only when the dismiss should be
deferred, but the annonymous class on
executeRunnableDismissingKeyguard() was always return true, which was
cause a janky timeout when the runnable didn't launch an activity.

BUG: 28303552

Change-Id: I1f9e299102d6cebba44794c026a69cf43ea06990

8 years agoFixing animation regression due to ag/957220.
Winson [Sat, 23 Apr 2016 23:06:50 +0000 (16:06 -0700)]
Fixing animation regression due to ag/957220.

- Ensure we clear deferred relayouts after finishing all animations in
  case they trigger a deferred layout in the animation-end callback.

Bug: 28287904
Change-Id: I6d71328fb3dc4595ea67ee18cfa57d85d741e6c6

8 years agoMerge "Disable StrictMode policy when setting up profile support" into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 15:54:36 +0000 (15:54 +0000)]
Merge "Disable StrictMode policy when setting up profile support" into nyc-dev

8 years agoDon't generate stack in logcat if assistant missing.
Dan Sandler [Mon, 25 Apr 2016 15:49:39 +0000 (11:49 -0400)]
Don't generate stack in logcat if assistant missing.

Low ram devices don't have assistants. Worth noting, but not
making a big stink about it.

Change-Id: I5a49be99bf688a5f1b800a1124b14a589ecf5b52
Fixes: 27210719

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:44 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4316b8a  -s ours

* commit '4316b8a09d591b64f5cb944417573fef47fc453c':
  Import translations. DO NOT MERGE

Change-Id: Idc0d1c71536b1145daa8cbdb540e72e067a3389c

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:42 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 779722d  -s ours

* commit '779722d7ed84aa0d7a03a3aec93690de9c3dcb7c':
  Import translations. DO NOT MERGE

Change-Id: I39eea7741f07a090ee8aa03919c5456b68a01b5f

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:40 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3496262  -s ours

* commit '3496262a987867f90260b467c366eb7e6be42333':
  Import translations. DO NOT MERGE

Change-Id: I3bf9e1bd1f1a66263d17b1635acb3ac2d8e91b7d

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:37 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b6a186c  -s ours

* commit 'b6a186ce5226c9f69b625f1fd016a5a7186bc2ff':
  Import translations. DO NOT MERGE

Change-Id: I4883f95e99133b9983d280bfdfd23f287a4595f9

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:15:34 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c8ad9db  -s ours

* commit 'c8ad9db8b0ce8d8a3301b96ba00f91af369fe38e':
  Import translations. DO NOT MERGE

Change-Id: Id5466e6df122f2630d1e5a7fdcad1e63660ffaf4

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:09:04 +0000 (15:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:46 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:30 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:08 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:07:50 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "PixelCopy fixes" into nyc-dev
John Reck [Mon, 25 Apr 2016 15:05:05 +0000 (15:05 +0000)]
Merge "PixelCopy fixes" into nyc-dev
am: a5bbbe5

* commit 'a5bbbe55b74d3a835b64fa18959f487da2df967e':
  PixelCopy fixes

Change-Id: I0da1b908278f385010662678be6eea6de6910d03

8 years agoMerge "PixelCopy fixes" into nyc-dev
John Reck [Mon, 25 Apr 2016 14:55:27 +0000 (14:55 +0000)]
Merge "PixelCopy fixes" into nyc-dev

8 years agoDisable StrictMode policy when setting up profile support
Calin Juravle [Fri, 22 Apr 2016 16:43:07 +0000 (17:43 +0100)]
Disable StrictMode policy when setting up profile support

Bug: 28304158
Change-Id: Iedf8714bd4f3526823b3060b30e0f11c6c0abcea

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
Ricky Wai [Mon, 25 Apr 2016 13:20:35 +0000 (13:20 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am: 4ace836

* commit '4ace8366619d04d326505ad689c5d43707f2aaea':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I43068aca865678a7c1a3f5f0d65aeaa6651b7d43

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
Ricky Wai [Mon, 25 Apr 2016 13:11:44 +0000 (13:11 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 12:54:27 +0000 (12:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 90edb46  -s ours

* commit '90edb46d017f793401f65c64368a7a4cf6f881f9':
  Import translations. DO NOT MERGE

Change-Id: I01ff764d1309b22b4bcb0fb9512a314aee9587ab

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 12:49:00 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 12:12:11 +0000 (05:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie8ab19f46d7eebd00b7d1cc476ebd153d733ceb0
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:58:49 +0000 (04:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: I052034274afbe75c7898cd0360ea627abed0dd19
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:54:12 +0000 (04:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic8c6b11898eaccb7327492bbf5d1aaff9070f135
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:49:48 +0000 (04:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0812aa0343d38d49e868e1e8fd895cb9d924b366
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 11:45:05 +0000 (04:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icf2694bb659505ee340498f007c1f303b006b5d0
Auto-generated-cl: translation import

8 years agoMake "work mode on dialog" show personal challenge in unified work lock
Ricky Wai [Fri, 15 Apr 2016 16:20:12 +0000 (17:20 +0100)]
Make "work mode on dialog" show personal challenge in unified work lock

Bug: 28183335
Change-Id: Ib212b283b9561f88899f6e7ea130944391b6e558

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 10:19:08 +0000 (10:19 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
am: 0c9c09c

* commit '0c9c09ccff72c9a017e6c7da3aef8738eea5f176':
  Regenerate ApplicationInfo if package suspend state is changed.

Change-Id: Ife031be013d9a06cb3f1e4f27b4da16d50e91e8a

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 10:12:01 +0000 (10:12 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
Clara Bayarri [Mon, 25 Apr 2016 09:39:33 +0000 (09:39 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
am: f48f390

* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: If6ed2adfcefb03bfc6f06b308c8ad1629cf8d57c

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
Clara Bayarri [Mon, 25 Apr 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev
Erik Kline [Mon, 25 Apr 2016 08:03:52 +0000 (08:03 +0000)]
Merge "Add state and callback logs for IpManager dump" into nyc-dev
am: 7587ba8

* commit '7587ba86086be9bd56d13fe28904b46ae7d3c521':
  Add state and callback logs for IpManager dump

Change-Id: I4e0ff6b3e28bc1a197a24f9372e544d44c103de1

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev
Erik Kline [Mon, 25 Apr 2016 07:55:58 +0000 (07:55 +0000)]
Merge "Add state and callback logs for IpManager dump" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 05:31:19 +0000 (22:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1811b4ca04bc4386f233bc1bdc2b486e6ce48b01
Auto-generated-cl: translation import

8 years agoAdd state and callback logs for IpManager dump
Erik Kline [Fri, 22 Apr 2016 07:41:26 +0000 (16:41 +0900)]
Add state and callback logs for IpManager dump

Bug: 27605330
Change-Id: I2e659d08fa9acd57a71901f28c85a92c0876c663

8 years agoMerge "Fix unexpected truncation again." into nyc-dev
Seigo Nonaka [Mon, 25 Apr 2016 03:42:37 +0000 (03:42 +0000)]
Merge "Fix unexpected truncation again." into nyc-dev
am: ab8913e

* commit 'ab8913e364d296fdb62e6b2572d102063bff42cb':
  Fix unexpected truncation again.

Change-Id: Ie5bf5250bf17c76ac2d6add63c20fb4aa25dfffb

8 years agoMerge "Fix unexpected truncation again." into nyc-dev
Seigo Nonaka [Mon, 25 Apr 2016 03:36:28 +0000 (03:36 +0000)]
Merge "Fix unexpected truncation again." into nyc-dev

8 years agoAPI changes for DownloadManager and JobScheduler.
Jeff Sharkey [Fri, 22 Apr 2016 15:50:16 +0000 (09:50 -0600)]
API changes for DownloadManager and JobScheduler.

To support moving DownloadManager, add new JobScheduler network type
constraint that matches "any network except roaming."  Also add an
API to get a specific JobInfo by ID.

Since the default network can be different on a per-app basis, and
individual apps may be blocked due to app standby, evaluate job
connectivity constraints on a per-UID basis.  To implement this
cleanly, add NetworkInfo.isMetered() to match the isRoaming() API.

Add new DownloadManager APIs to support charging and device idle
constraints, which are plumbed through to JobScheduler under the
hood when scheduled.

Add filtering to JobScheduler dumpsys to omit noisy details for
packages the caller isn't interested in.

Bug: 280988822657172419821935
Change-Id: I09ca7184ef7ce6adba399f579d415a5fb2ea6110

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
Selim Cinek [Sun, 24 Apr 2016 14:51:30 +0000 (14:51 +0000)]
Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev
am: 14d8be7

* commit '14d8be728bbca1e7d721479fa1476e23e1b7accf':
  Fixed the paddings in inbox style to match the rest of the templates

Change-Id: I1416909ca0a3580f2ce2aaa1ab7265efa0c6ba4d

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
TreeHugger Robot [Sun, 24 Apr 2016 14:44:26 +0000 (14:44 +0000)]
Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev

8 years agofix "am start -W" hang on activity start
Chong Zhang [Sat, 23 Apr 2016 21:33:55 +0000 (14:33 -0700)]
fix "am start -W" hang on activity start

Normally launch time counts from the point when the activity is
resumed, to when the first window is drawn. However the activity
could become visible before it is resumed, due to some other
activity in the same task being launched. In this case we still
need to report launch time to unblock
ActivityStarter.startActivityMayWait().

bug: 28333487
Change-Id: I445b602f495ed0c3cb669e2d81a137280317534f

8 years agoTap, don't touch.
Dan Sandler [Sat, 23 Apr 2016 15:12:00 +0000 (11:12 -0400)]
Tap, don't touch.

Part of global change from touch —> tap for certain screen
gestures.

Change-Id: Ifffee1336793e8304dc03da5c3d36a1fe8ba133f
Fixes: 26750003

8 years agoMove EXTRA_SUBSTITUTE_APP_NAME to the published system api.
Dan Sandler [Fri, 15 Apr 2016 03:34:54 +0000 (23:34 -0400)]
Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.

Bug: 26517701
Change-Id: I27000d777247c598cc509079004b4506ef05b404

8 years agoShow "Android System" instead of "System UI" in screenshot notifications.
Dan Sandler [Thu, 14 Apr 2016 14:16:28 +0000 (10:16 -0400)]
Show "Android System" instead of "System UI" in screenshot notifications.

Bug: 26517701
Change-Id: I0f4a58531066c49fed90bcdd78c92a4f212ada3b

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev
Chris Banes [Sat, 23 Apr 2016 07:09:24 +0000 (07:09 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
am: b02d51b

* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
  Make AbsSavedState read using given ClassLoader

Change-Id: I680a362e229c7ebbd42f344fa7446aff86fa98ae

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev
Chris Banes [Sat, 23 Apr 2016 07:04:20 +0000 (07:04 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev

8 years agoMerge "Fix content description for notification icons" into nyc-dev
Adrian Roos [Sat, 23 Apr 2016 01:51:01 +0000 (01:51 +0000)]
Merge "Fix content description for notification icons" into nyc-dev
am: eefff37

* commit 'eefff3742de62101341128a32b227a25ed22df06':
  Fix content description for notification icons

Change-Id: I1b150df0a92f47d2d893c18ada72020601527ed8

8 years agoMerge "Fix content description for notification icons" into nyc-dev
TreeHugger Robot [Sat, 23 Apr 2016 01:45:00 +0000 (01:45 +0000)]
Merge "Fix content description for notification icons" into nyc-dev

8 years agoAdded the ripple drawable back to the media notification
Selim Cinek [Sat, 23 Apr 2016 00:40:13 +0000 (17:40 -0700)]
Added the ripple drawable back to the media notification

Change-Id: I12d1de0981d06caef2b7f3f114b432f29c8f836b
Fixes: 28018612

8 years agoFixed the paddings in inbox style to match the rest of the templates
Selim Cinek [Thu, 21 Apr 2016 23:40:47 +0000 (16:40 -0700)]
Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ib7701ac29d5f8a123441fbf6d95a5b0b9cadfb4e
Fixes: 27998488

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev
Amith Yamasani [Sat, 23 Apr 2016 01:01:58 +0000 (01:01 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev
am: c3c45fa

* commit 'c3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36':
  Fix a regression in assist when context is disabled

Change-Id: I6209180e67e91ac264e50be957d87c2d897bcc3c

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev
TreeHugger Robot [Sat, 23 Apr 2016 00:56:10 +0000 (00:56 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev