git.osdn.net Git - android-x86/frameworks-base.git/log

Lajos Molnar [Mon, 25 Apr 2016 22:51:20 +0000 (22:51 +0000)]

Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
am: 4710431

* commit '4710431dc4751e9674b9e2e620f425603cf24643':
clarify MediaCodec.setVideoScalingMode behavior

Change-Id: Ic92672b020aa9547a111e0bc728cb8edfa4a1656

commit | commitdiff | tree

Wale Ogunwale [Mon, 25 Apr 2016 22:39:16 +0000 (22:39 +0000)]

Merge "Fixed issue with wrong stack fullscreen state on configuration change" into nyc-dev
am: b59beff

* commit 'b59beffa89b6bc4f0c2d9469443c5730787ed362':
Fixed issue with wrong stack fullscreen state on configuration change

Change-Id: Ib683c2584aaf47dccc9e4ff9957d766ccc353297

commit | commitdiff | tree

Lajos Molnar [Mon, 25 Apr 2016 22:36:53 +0000 (22:36 +0000)]

Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 22:27:56 +0000 (22:27 +0000)]

Merge "Fixed issue with wrong stack fullscreen state on configuration change" into nyc-dev

commit | commitdiff | tree

Alan Viverette [Mon, 25 Apr 2016 22:27:19 +0000 (22:27 +0000)]

Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev
am: 68d180b

* commit '68d180bbd1892ee5112c76be842a40a7251ed5a5':
Check for null drawable during LayerDrawable.jumpToCurrentState()

Change-Id: Ida4daa96fdbee8b2d566ddb054f82af9120a86f3

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 22:15:16 +0000 (22:15 +0000)]

Merge "Destroy both CE and DE data when corrupted." into nyc-dev
am: 436308f

* commit '436308f88b8f165f834a6b37f7638d6d4b7a6ca7':
Destroy both CE and DE data when corrupted.

Change-Id: Ic60599ed7ee0cd200d1b95690e5e687bd403cfad

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 22:15:15 +0000 (22:15 +0000)]

Merge "Track down Contexts without data directories." into nyc-dev
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
Track down Contexts without data directories.

Change-Id: Ib185bbc865fe2f1704a33b3f7557fd6c5226be1f

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 22:10:36 +0000 (22:10 +0000)]

Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev

commit | commitdiff | tree

Alex Light [Mon, 25 Apr 2016 22:03:43 +0000 (22:03 +0000)]

Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
am: 57413a7

* commit '57413a74777060d9368f89966e9abcf96e33af8e':
Make fake libart for misbehaving apps be loaded.

Change-Id: I2ac86c136182d5bf84ace20a6c2dda2dffe57d40

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 21:59:57 +0000 (21:59 +0000)]

Merge "Destroy both CE and DE data when corrupted." into nyc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 21:59:40 +0000 (21:59 +0000)]

Merge "Track down Contexts without data directories." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 21:53:29 +0000 (21:53 +0000)]

Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev

commit | commitdiff | tree

Amith Yamasani [Mon, 25 Apr 2016 21:45:13 +0000 (21:45 +0000)]

Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev
am: 1d66995

* commit '1d66995f47d548efe7863e88a8cc7bd2c66661a0':
Fix deadlock between VrManager, ActivityManager and WindowManager

Change-Id: I26ea57a0a49e78e063117f71b0f6fede8b413e7c

commit | commitdiff | tree

Amith Yamasani [Mon, 25 Apr 2016 21:37:16 +0000 (21:37 +0000)]

Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 21:26:57 +0000 (21:26 +0000)]

Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev
am: 98afb34

* commit '98afb342df74a657e69a478b5ace19450b579660':
Wait for next app to be visible if current activity is marked visible

Change-Id: I6fa1dd67f8bff23596277d3c55869961ffa6b220

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 21:13:27 +0000 (21:13 +0000)]

Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Apr 2016 21:09:04 +0000 (21:09 +0000)]

Merge "Fix bug with cancelled drag" into nyc-dev
am: df89cd1

* commit 'df89cd1b39bcebdd37b29185c76aa005863e8c2f':
Fix bug with cancelled drag

Change-Id: I9ebb6f5252349cb5ec7e423ee18f49d6c34c64e0

commit | commitdiff | tree

Wale Ogunwale [Mon, 25 Apr 2016 20:40:30 +0000 (13:40 -0700)]

Fixed issue with wrong stack fullscreen state on configuration change

- No need to run TaskStack#updateBoundsAfterConfigChange if the stack
is fullscreen as the bounds will already be updated to when the display
content changed due to rotation.
- Correctly set mTmpRect2 that we are using to calculate the rotated
bounds to the current mBounds.

Bug: 28319277
Bug: 27870534
Change-Id: Ic3d9407b735210351c28297de79bf035909afcfe

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Apr 2016 20:59:38 +0000 (20:59 +0000)]

Merge "Fix bug with cancelled drag" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Mon, 25 Apr 2016 20:07:59 +0000 (13:07 -0700)]

clarify MediaCodec.setVideoScalingMode behavior

Bug: 28131249
Change-Id: I4fd3a5333cbdc0ebec683c9a43ce071478a79d90

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 20:17:53 +0000 (13:17 -0700)]

Wait for next app to be visible if current activity is marked visible

WM's AppWindowToken.updateReportedVisibilityLocked() may not report
nowVisible if the app has animation set. So nowVisibible could be false
for a while after the app is already on screen. If we finish the app in
this state, we still need to wait for next app to be visible.

bug: 28019637
Change-Id: I4f9f8e138f5d011a9ab393913159ed2978d26e0d

commit | commitdiff | tree

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

commit | commitdiff | tree

Dongwon Kang [Fri, 22 Apr 2016 18:00:03 +0000 (11:00 -0700)]

TIF: Be consistent with argument name for startRecording

Change-Id: Icb0125049cc92c5664e0810cdb86f1cb0903405f

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 20:14:57 +0000 (20:14 +0000)]

Merge "API changes for DownloadManager and JobScheduler." into nyc-dev

commit | commitdiff | tree

Kweku Adams [Mon, 25 Apr 2016 20:09:39 +0000 (20:09 +0000)]

Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Apr 2016 20:00:27 +0000 (13:00 -0700)]

Fix bug with cancelled drag

Bug: 28257206
Change-Id: Ic7342f4284185486e884836220b05423e308f7ae

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Apr 2016 19:33:38 +0000 (19:33 +0000)]

Merge "Fix stuck windows in multi-window" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Apr 2016 19:29:39 +0000 (19:29 +0000)]

Merge "Fix layout for child windows" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 19:23:30 +0000 (13:23 -0600)]

Destroy both CE and DE data when corrupted.

When we find either a CE or DE data directory that has been corrupted,
destroy both CE and DE data together, since internal services like
AccountManager get confused if they find DE data without matching CE
data.

Bug: 28346537
Change-Id: Iaf3694c20e4664536af25a2afeb45fe8a90d8171

commit | commitdiff | tree

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.

commit | commitdiff | tree

Daniel Sandler [Mon, 25 Apr 2016 19:21:44 +0000 (19:21 +0000)]

Merge "Tap, don't touch." into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 19:20:25 +0000 (13:20 -0600)]

Track down Contexts without data directories.

Data directories for all packages should be created and managed by
installd; if we create a Context and the data directory doesn't exist
yet, we're in trouble, since a later mkdirs() would end up creating
the directory with incorrect permissions, mode, and SELinux labels.

Bug: 28272737
Change-Id: Ie3bb884ab07748719378de5c792046a031a3f945

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mady Mellor [Mon, 25 Apr 2016 19:06:16 +0000 (19:06 +0000)]

Merge "Fix gear being covered on notification update" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 18:57:29 +0000 (18:57 +0000)]

Merge "Added a 'deferred' parameter on executeRunnableDismissingKeyguard()." into nyc-dev

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 18:39:45 +0000 (18:39 +0000)]

Merge "WebView doc: explain persist js across navigations" into nyc-dev

Merge "Add back protected profile availibility broadcasts." into nyc-dev
am: cda5089

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

Change-Id: I64cb4f8be388dbadf607d19d64e4072df03ba7d2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Add back protected profile availibility broadcasts." into nyc-dev

commit | commitdiff | tree

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

Add back protected profile availibility broadcasts.

Bug: 27532254
Change-Id: Ifbf59f64358864cd1d48be5e797c45ec2744eac0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:03:34 +0000 (17:03 +0000)]

Merge "Return null when user is locked" into nyc-dev

WebView doc: explain persist js across navigations

BUG: 28207652
Change-Id: Ib33f029c2cae6c1482c0c951075275e9f96ae73c

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 16:34:11 +0000 (16:34 +0000)]

Merge "Strings for post-upgrade." into nyc-dev

commit | commitdiff | tree

Winson Chung [Mon, 25 Apr 2016 16:25:49 +0000 (16:25 +0000)]

Merge "Fixing animation regression due to ag/957220." into nyc-dev

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Viverette [Mon, 25 Apr 2016 15:28:17 +0000 (11:28 -0400)]

Check for null drawable during LayerDrawable.jumpToCurrentState()

Child drawables specified as theme attributes may not have been
initialized yet.

Bug: 28371482
Change-Id: I8452a7c5b8f74368c58ba3373336bf7d650af7a3

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4316b8a -s ours

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

Change-Id: Idc0d1c71536b1145daa8cbdb540e72e067a3389c

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 779722d -s ours

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

Change-Id: I39eea7741f07a090ee8aa03919c5456b68a01b5f

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3496262 -s ours

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

Change-Id: I3bf9e1bd1f1a66263d17b1635acb3ac2d8e91b7d

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b6a186c -s ours

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

Change-Id: I4883f95e99133b9983d280bfdfd23f287a4595f9

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c8ad9db -s ours

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

Change-Id: Id5466e6df122f2630d1e5a7fdcad1e63660ffaf4

Merge "Import translations. DO NOT MERGE" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

John Reck [Mon, 25 Apr 2016 14:55:27 +0000 (14:55 +0000)]

Merge "PixelCopy fixes" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 90edb46 -s ours

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

Change-Id: I01ff764d1309b22b4bcb0fb9512a314aee9587ab

Merge "Import translations. DO NOT MERGE" into nyc-dev

Import translations. DO NOT MERGE

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

Import translations. DO NOT MERGE

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

Import translations. DO NOT MERGE

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

Import translations. DO NOT MERGE

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

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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