227340 Commits

Author SHA1 Message Date
Chris Craik
c63107cbad Merge "Merged op dispatch in OpReorderer" 2015-12-07 20:37:31 +00:00
Chris Craik
15c3f19a44 Merged op dispatch in OpReorderer
bug:22480459

Also switches std::functions to function pointers on OpReorderer, and
switches AssetAtlas' entry getter methods to using pixelRef pointers,
so it's clear they're the keys.

Change-Id: I3040ce5ff4e178a8364e0fd7ab0876ada7d4de05
2015-12-07 12:34:46 -08:00
Fyodor Kupolov
79aeb92f4d Merge "Added SynchronousUserSwitchObserver" 2015-12-07 18:55:09 +00:00
Fyodor Kupolov
a9d492d7ff Merge "Allow --user current in dpm command" 2015-12-07 18:38:04 +00:00
Felipe Leme
21d4b20f23 Merge "Changed ActivityManager.requestBugreport() to take a 'progress' parameter." 2015-12-07 18:02:40 +00:00
Xiaohui Chen
86fd6d1560 Do not force keyguard orientation to no sensor.
Fixing a bug that if the device is hold in landscape mode during
initial device setup, after the setup is done, the screen would rotate
to portrait mode and then back to landscape.

Bug: 25817950
Change-Id: Ibbcb7be01d8f14d7b6a98f069cb7eb3a94da12bb
2015-12-07 17:44:18 +00:00
Geoff Mendal
ad1a018b17 Merge "Import translations. DO NOT MERGE" 2015-12-07 17:40:19 +00:00
Filip Gruszczynski
ef2f72bb0e Refactoring: merge two snippets of adding activity to stopped.
Change-Id: I70777333ca9ff6c4f0736e036bd0946add4b041f
2015-12-07 09:20:06 -08:00
Geoff Mendal
18fbbc602e Import translations. DO NOT MERGE
Change-Id: I7b15e88df26e0b96d985012082c7cae33a7f7781
Auto-generated-cl: translation import
2015-12-07 18:14:13 +01:00
Wale Ogunwale
5f986095be APIs for activity to know when its windowing/pip modes change
Added APIs that allow activities to ask the system if they are currently
in multi-window or picture-in-picture mode and also get notified when
their modes change.

Bug: 25509834
Bug: 25683717
Change-Id: I4b8c316a49940bd6a8b31a93b345f9fd725a4721
2015-12-07 07:40:56 -08:00
Todd Kennedy
c72b3101ee Merge "Add ephemeral installs" 2015-12-07 15:33:05 +00:00
Robin Lee
70eaef412e Merge "Send pwchange broadcast to caller only in FBE case" 2015-12-07 14:37:50 +00:00
Chris Banes
3aa58c9e27 Merge "Fix possibility of ScrollView not allowing clicks after a fling" 2015-12-07 13:54:34 +00:00
Geoff Mendal
4301bc82aa Merge "Import translations. DO NOT MERGE" 2015-12-07 13:50:36 +00:00
Geoff Mendal
87661e2098 Import translations. DO NOT MERGE
Change-Id: I6dfc3a1250262aaf29428f1a907a271650892be0
Auto-generated-cl: translation import
2015-12-07 05:49:49 -08:00
Geoff Mendal
2b8ceb5515 Merge "Import translations. DO NOT MERGE" 2015-12-07 13:40:53 +00:00
Robin Lee
ee3a437464 Send pwchange broadcast to caller only in FBE case
When per-user encryption is set up and we change the password of a
profile, the parent and other profiles shouldn't receive an
ACTION_PASSWORD_CHANGED as they have their own distinct passwords.

Change-Id: I70d4ec81277a9bdc3ac6cd952b84cd769a2800b4
2015-12-07 13:39:11 +00:00
Geoff Mendal
6c7a00208e Import translations. DO NOT MERGE
Change-Id: Ia3f58d3662cffb305e2e5d41f497595e5e57e2f6
Auto-generated-cl: translation import
2015-12-07 05:39:02 -08:00
Geoff Mendal
512c15b8bd Import translations. DO NOT MERGE
Change-Id: If997fb074dbecdcf11d89cb44046be3abf617203
Auto-generated-cl: translation import
2015-12-07 05:17:15 -08:00
Chris Banes
f2a7e9712f Fix possibility of ScrollView not allowing clicks after a fling
The reason that manifests is because SV's
onInterceptTouchEvent checks if it's scroller.isFinished()
returns true. The result of Scroller.isFinished() is only
valid if it has had computeScrollOffset() called on it before.

ScrollView currently posts a invalidation after a computeScroll()
call, which means that isFinished() *should* be valid, but it's
better to be explicit which CL adds.

BUG: 26051101
Change-Id: If78f48dc855de1776011cb7b0f95cb0a80d9b777
2015-12-07 11:53:26 +00:00
Tomasz Mikolajewski
e85cf98a80 Merge "Wire support for archives to DocumentsUI." 2015-12-07 03:50:02 +00:00
Tomasz Mikolajewski
39acff5a36 Wire support for archives to DocumentsUI.
Bug: 20176812
Change-Id: I8220afa2f53b07aa842bf6ac24fcc62afd4e2617
2015-12-07 11:34:03 +09:00
Filip Gruszczynski
3696301ada Merge "Update client configuration when resizing without crossing size threshold." 2015-12-07 02:17:47 +00:00
Filip Gruszczynski
a99fce54d0 Merge "Don't lose stopping state when getting paused confirmation." 2015-12-07 01:11:01 +00:00
Felipe Leme
4cc863338d Changed ActivityManager.requestBugreport() to take a 'progress' parameter.
When progress is set to 'true', it calls the new, enhanced
'bugreportplus' service, while when 'false' it calls the regular
'bugreport' service.

'bugreportplus' is more user-friendly (it shows a system notification
with the progress, allow user to cancel, etc...), at the cost of
consuming more resources. As such, the "Take Bug Report" UI will be
changed to offer the user a combo with these 2 options, but for now it's
always going to be 'bugreportplus'

BUG: 26034608
Change-Id: I21a6b5b092a85614e91d523b8f4df1fb00e49b3b
2015-12-05 10:30:18 -08:00
Tyler Gunn
8d19ad443f Merge commit 'da131290ae5e476691e05e5eb4ac6d507012a0ac' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:05:15 -08:00
Tyler Gunn
fbdb8fb3d0 Merge commit '9aadad47a0085c4298307781a423064207933f0b' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:04:50 -08:00
Tyler Gunn
afe3886b39 Merge commit '70da83381f77e0ee9ada47eafaae395038ff77ad' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:04:44 -08:00
Tyler Gunn
aa5c2c9303 Merge commit 'bc4da97ce0fcd0ddef228048bc663e383776c323' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:04:20 -08:00
Tyler Gunn
a16144359a Merge commit '5e42c1cf1c7786a550df351622865ba1710a0ea6' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:04:14 -08:00
Tyler Gunn
2c3f36de14 Merge commit 'd40a83543a67a911b5dcfbb8d164cea0c5285a78' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:04:03 -08:00
Tyler Gunn
de8732bb18 Merge commit '3132d0c9f894707043c07622fae7b33c85ea0013' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:03:57 -08:00
Tyler Gunn
6e2d208097 Merge commit '73831680cd7e47df103cf60a2230ed411e5d3b93' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:03:46 -08:00
Tyler Gunn
7b879ff4bc Merge commit 'c956f0dcb3d93dd0f3ee0a3daafaf2da8212402e' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:03:41 -08:00
Tyler Gunn
1cee477bc5 Merge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into tgunn-mncvtdev-to-master-2015-12-04
Change-Id: I156930f72a3267b59123469231331e9da5ac6aab
2015-12-04 21:03:30 -08:00
Tyler Gunn
66bf567e70 Merge commit '98bd72181e176cdc5536b9709127a71cca082bbf' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:00:51 -08:00
Tyler Gunn
c87a3a2c0a Merge commit '109e9c449d5a0070df793c63383e474a03242ba5' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:00:24 -08:00
Tyler Gunn
46b2bacb05 Merge commit 'f231ca1c67f3925d018265f99f5b8a691d190d68' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:00:18 -08:00
Tyler Gunn
26a43d1570 Merge commit '6cb5fcaad143227002bd4d00b1974e126d9a8090' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:00:00 -08:00
Tyler Gunn
c03f0cf352 Merge commit 'b19c0041914019e6d9d96fce67ec0e7a6820bf3c' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 20:59:54 -08:00
Ying Wang
471c1adf08 Add android.support.v7.recyclerview resources.
This fixes build error of unresolved symbols if you build with Jack
disabled.

Change-Id: I0a9e1288015cc8894b7cdda3130aa8df628092e9
2015-12-04 18:45:57 -08:00
Elliott Hughes
43aecc85e8 Merge "Track rename from base/ to android-base/." am: 9f6a2ae67c am: 8aa8fe2c64
am: 7e7047ea0a

* commit '7e7047ea0aba2099408fba70937a758a91cebbca':
  Track rename from base/ to android-base/.
2015-12-04 17:51:41 -08:00
Elliott Hughes
7e7047ea0a Merge "Track rename from base/ to android-base/." am: 9f6a2ae67c
am: 8aa8fe2c64

* commit '8aa8fe2c64cf4611ba68d90992e54858a35aae58':
  Track rename from base/ to android-base/.
2015-12-05 01:44:41 +00:00
Elliott Hughes
8aa8fe2c64 Merge "Track rename from base/ to android-base/."
am: 9f6a2ae67c

* commit '9f6a2ae67c70085d550962829e6bfe76706907d8':
  Track rename from base/ to android-base/.
2015-12-05 01:36:53 +00:00
Filip Gruszczynski
dba623ae56 Don't lose stopping state when getting paused confirmation.
In some cases we request pause and soon after request stop of an
activity. An example of this is maximizing an activity in side by side
mode when recents are visible. First, we add recents to a list of
activities to be stopped (because it becomes invisible), then we request
a pause (because we resume full screen activity and pause all other
stacks) and finally request a stop (from the list to which we added the
request).

The activity now will be put into pausing state (requesting pause), then
stopping (requesting stop), then paused (confirmation comes from the
activity) and stopped (another confirmation comes from activity). If we
switch from stopping to paused, the stop confirmation will become
confused.

Bug: 25729693

Change-Id: I935acd71a28f3d0882f608bdd4d7216cd08ba2eb
2015-12-04 17:30:52 -08:00
Elliott Hughes
9f6a2ae67c Merge "Track rename from base/ to android-base/." 2015-12-05 01:30:46 +00:00
Filip Gruszczynski
ca66481244 Update client configuration when resizing without crossing size threshold.
Even though the activity won't be relaunched and won't receive a
callback about the resize, we still need to update it's configuration.
Otherwise when the application queries for it, it will receive wrong
data.

Bug: 23904868
Change-Id: I601e91b8e71691c1cb5edb2734894441c4fde8e2
2015-12-04 17:14:52 -08:00
Eino-Ville Talvala
d351e29b8e Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b am: 5794dbb1a5
am: dd00ed1554

* commit 'dd00ed1554113d52c8b07ee36d5b0b912d74a268':
  Camera: codegen doc update
2015-12-05 00:45:33 +00:00
Yorick Henning
48e0445620 Merge "Added 46654* to fee-free US short codes." 2015-12-05 00:37:41 +00:00
Eino-Ville Talvala
dd00ed1554 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b
am: 5794dbb1a5

* commit '5794dbb1a5f54b116911526c1086efda5dfb63f7':
  Camera: codegen doc update
2015-12-04 16:36:06 -08:00