OSDN Git Service
Julius D'souza [Thu, 13 Oct 2016 07:53:55 +0000 (07:53 +0000)]
DO NOT MERGE: Ambient light sensor changes for doze mode.
am:
c4e1e4909d
Change-Id: I797db8f2a8607723582bb705bd667bd981d5f16f
Julius D'souza [Tue, 4 Oct 2016 18:05:56 +0000 (11:05 -0700)]
DO NOT MERGE: Ambient light sensor changes for doze mode.
Bug:
18573988
Change-Id: I07eed120bdbefd23408921405466566da33c397d
Andrii Kulian [Thu, 13 Oct 2016 05:08:08 +0000 (05:08 +0000)]
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev am:
1fefc8b9fa
am:
c4ceb50303
Change-Id: I48710a6b2b37827ab78285d9767e6368d481e830
Andrii Kulian [Thu, 13 Oct 2016 05:07:15 +0000 (05:07 +0000)]
DO NOT MERGE -- Adjust focus when moving task back am:
d4b98705b5
am:
75cd6ef5dc
Change-Id: I07746c065e749549c7a30820f10f24945b30c760
Andrii Kulian [Thu, 13 Oct 2016 05:01:15 +0000 (05:01 +0000)]
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
am:
1fefc8b9fa
Change-Id: I57af7dceec243b6befbaa293438d6239053bb0ed
Andrii Kulian [Thu, 13 Oct 2016 05:01:11 +0000 (05:01 +0000)]
DO NOT MERGE -- Adjust focus when moving task back
am:
d4b98705b5
Change-Id: I1d07e84360ef0bfeb6b0ce41466e4042ca70ad81
TreeHugger Robot [Thu, 13 Oct 2016 04:47:44 +0000 (04:47 +0000)]
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
Andrii Kulian [Wed, 12 Oct 2016 21:23:19 +0000 (14:23 -0700)]
DO NOT MERGE -- Adjust focus when moving task back
Resumed and focused activity should be adjusted simultaneously.
This was missing when task was moved back and focus was adjusted only
after previous activity stopped.
Bug:
31983988
Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361
Robert Carr [Thu, 13 Oct 2016 02:23:02 +0000 (02:23 +0000)]
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev am:
1553d5411c
am:
708d218468
Change-Id: Ic93d5ea5c3fda6cde0368c399c8919819f4114ce
Robert Carr [Thu, 13 Oct 2016 02:22:06 +0000 (02:22 +0000)]
Correct recently introduced logic error in seamless rotation detection. am:
e441e7f15f
am:
bcbf6707b0
Change-Id: I856eec21e2d7687683a0bcde683ea6b7a05dd20a
Robert Carr [Thu, 13 Oct 2016 02:15:33 +0000 (02:15 +0000)]
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev
am:
1553d5411c
Change-Id: I9e12db9f686c934a2e2d391d80a0c1bb26398c7f
Robert Carr [Thu, 13 Oct 2016 02:15:31 +0000 (02:15 +0000)]
Correct recently introduced logic error in seamless rotation detection.
am:
e441e7f15f
Change-Id: I3e9bdef49a3749e82dbed82bc230bcaac958608a
TreeHugger Robot [Thu, 13 Oct 2016 02:05:30 +0000 (02:05 +0000)]
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev
Selim Cinek [Thu, 13 Oct 2016 00:58:30 +0000 (00:58 +0000)]
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev am:
0bdfc7be66
am:
77988e4aec
Change-Id: I02d6144c1b0ed72e178cd4e3899670b7d4c3d5a9
Selim Cinek [Thu, 13 Oct 2016 00:57:38 +0000 (00:57 +0000)]
Fixed a bug where the system could crash when expanding am:
3e77984434
am:
c19b510454
Change-Id: I9a08497e8c49fe916f42cac3a1d56ea5ec4fc8c3
Selim Cinek [Thu, 13 Oct 2016 00:56:39 +0000 (00:56 +0000)]
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev am:
d517c3c16b
am:
531099ae14
Change-Id: I7b05e1c54ed2ed759b5d92180edbfbdda2df841c
dooyoung.hwang [Thu, 13 Oct 2016 00:55:49 +0000 (00:55 +0000)]
Fix crashes after notifying bad notification am:
78c4114101
am:
08011cdf33
Change-Id: I679181fb5f23c48825c21d9a210e70eaca3835f2
Selim Cinek [Thu, 13 Oct 2016 00:54:53 +0000 (00:54 +0000)]
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev am:
7ce68fd8a4
am:
f3eb11bdc1
Change-Id: I126575e006e20a008cfe44a370f026a81d73d267
Selim Cinek [Thu, 13 Oct 2016 00:53:56 +0000 (00:53 +0000)]
Fixed an issue where the emergency affordance would show am:
bd740cd56a
am:
c46b2ef8d2
Change-Id: Ice913b2ace0dc3962cd3b048ba847f4050c29cce
Selim Cinek [Thu, 13 Oct 2016 00:44:21 +0000 (00:44 +0000)]
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
am:
0bdfc7be66
Change-Id: Ic63b6f6bf187ea632a05a6524d3b0f8bef376b74
Selim Cinek [Thu, 13 Oct 2016 00:44:16 +0000 (00:44 +0000)]
Fixed a bug where the system could crash when expanding
am:
3e77984434
Change-Id: Icf8c8743f57a5e402275adfc645f08a10cf94a3b
Selim Cinek [Thu, 13 Oct 2016 00:42:47 +0000 (00:42 +0000)]
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev
am:
d517c3c16b
Change-Id: I07d4f185a096c22628cd0d0ffcb789391a81f518
dooyoung.hwang [Thu, 13 Oct 2016 00:42:44 +0000 (00:42 +0000)]
Fix crashes after notifying bad notification
am:
78c4114101
Change-Id: I4d72feb9a40b99c5b40307ad01d708b3a66d1f54
Selim Cinek [Thu, 13 Oct 2016 00:41:27 +0000 (00:41 +0000)]
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
am:
7ce68fd8a4
Change-Id: I775e64348075fe1dd57a7133fcdc7b11f79415d6
Selim Cinek [Thu, 13 Oct 2016 00:41:24 +0000 (00:41 +0000)]
Fixed an issue where the emergency affordance would show
am:
bd740cd56a
Change-Id: I6ce705cc701bf149dec45feabcf4777cc89afa6a
Selim Cinek [Thu, 13 Oct 2016 00:37:27 +0000 (00:37 +0000)]
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
Selim Cinek [Thu, 13 Oct 2016 00:36:27 +0000 (00:36 +0000)]
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev
Selim Cinek [Thu, 13 Oct 2016 00:29:57 +0000 (00:29 +0000)]
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
Adrian Roos [Wed, 12 Oct 2016 23:26:15 +0000 (23:26 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev am:
5c8fc58850
am:
b920d48e0a
Change-Id: Ie7d699fa304be1b75e7037d75c02ab5302a3205d
Adrian Roos [Wed, 12 Oct 2016 23:25:20 +0000 (23:25 +0000)]
Fix Notification.Action.Builder copy constructor am:
7af5362571
am:
342bc437bf
Change-Id: I0387ab66ec3d44e34a884fb2f92f32af35e2883c
Adrian Roos [Wed, 12 Oct 2016 23:19:22 +0000 (23:19 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
am:
5c8fc58850
Change-Id: Ic9b035247f5b09582adf20c7cb47361f7b035cf7
Adrian Roos [Wed, 12 Oct 2016 23:19:19 +0000 (23:19 +0000)]
Fix Notification.Action.Builder copy constructor
am:
7af5362571
Change-Id: I0853e663b1895e2c45fad17cfee79202f3b14ef7
TreeHugger Robot [Wed, 12 Oct 2016 23:11:20 +0000 (23:11 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
Adrian Roos [Wed, 12 Oct 2016 20:44:05 +0000 (13:44 -0700)]
Fix Notification.Action.Builder copy constructor
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.
Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes:
31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
Adam Lesinski [Wed, 12 Oct 2016 21:10:41 +0000 (21:10 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev am:
baac85ec1f
am:
cde80e68c6
Change-Id: I445fb76e38d34e2df74ff61cfd4b1ce6166a7265
Martin Wallgren [Wed, 12 Oct 2016 21:09:42 +0000 (21:09 +0000)]
RRO: Synchronize access to overlays.list am:
0fbb608110
am:
dce79f10ba
Change-Id: Idc121ffe64f1bc7b5bdcb1a800305165f27f1c0a
Doris Liu [Wed, 12 Oct 2016 21:04:16 +0000 (21:04 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev am:
269f76a7d2
am:
64d24d6631
Change-Id: Id6964ab08d4443a3ad4932a9ed25751c922a411a
Doris Liu [Wed, 12 Oct 2016 21:03:14 +0000 (21:03 +0000)]
Fix SkShader leak for Gradient VectorDrawable and test am:
fc9cf72339
am:
c47199bb6a
Change-Id: I261f8f3708f526c15ae93c51d24bdaee054354f6
Adam Lesinski [Wed, 12 Oct 2016 21:03:13 +0000 (21:03 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev
am:
baac85ec1f
Change-Id: I713561fcfdf28250e406fc9d7b497c2b70b287ca
Martin Wallgren [Wed, 12 Oct 2016 21:03:11 +0000 (21:03 +0000)]
RRO: Synchronize access to overlays.list
am:
0fbb608110
Change-Id: I44a716df3954b6d2d58d7c9784f8b55cf041b10b
Doris Liu [Wed, 12 Oct 2016 20:56:58 +0000 (20:56 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev
am:
269f76a7d2
Change-Id: Ia9a56b7c8c20d47e9dcc448c59061784d4edf865
Doris Liu [Wed, 12 Oct 2016 20:56:55 +0000 (20:56 +0000)]
Fix SkShader leak for Gradient VectorDrawable and test
am:
fc9cf72339
Change-Id: I493a8c52cd4cca79971a4fd2e3eed7f566ce8ecd
Adam Lesinski [Wed, 12 Oct 2016 20:55:53 +0000 (20:55 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev
Doris Liu [Wed, 12 Oct 2016 20:44:47 +0000 (20:44 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev
Robert Carr [Wed, 12 Oct 2016 19:48:13 +0000 (12:48 -0700)]
Correct recently introduced logic error in seamless rotation detection.
The code detecting whether we should rotate seamlessly (which for
example we do not support for 180 degree rotations) was moved to before
mRotation was updated, so it was always passing the same value for old
and new rotation, and we were failing to perform the 180 degree rotation
check. Correct this.
Test: Rotate the device 180 degrees at once while in Camera. Things look ok.
Bug:
32025371
Change-Id: I0ef08e8cc4e5d87fdff6d839381196c2b52e71d5
Selim Cinek [Wed, 12 Oct 2016 18:34:52 +0000 (11:34 -0700)]
Fixed a bug where the system could crash when expanding
When expanding a notification it could disappear and the
system would crash.
Test: Manual, expand notification group and have it removed while
doing so.
Change-Id: I421ab0cf7a9292e6894529c80784ba0989071fb0
Fixes:
31941185
Shreyas Basarge [Wed, 12 Oct 2016 17:26:56 +0000 (17:26 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev am:
d5541b987a
am:
e04c7f151b
Change-Id: I0f57a66ce33a44e56568a7a53f71424f032ff3f1
Shreyas Basarge [Wed, 12 Oct 2016 17:25:58 +0000 (17:25 +0000)]
Add a delay before scheduling local syncs am:
ba1f790369
am:
50a22690f8
Change-Id: Ie4badc26375427be86788fefc3d5e84cfcdab933
Shreyas Basarge [Wed, 12 Oct 2016 17:19:59 +0000 (17:19 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev
am:
d5541b987a
Change-Id: If91f2edc57109308b34be67b9f3861b84147153f
Shreyas Basarge [Wed, 12 Oct 2016 17:19:56 +0000 (17:19 +0000)]
Add a delay before scheduling local syncs
am:
ba1f790369
Change-Id: I4c880c4111f99d80cee7b960a97133cc0b86d61c
Shreyas Basarge [Wed, 12 Oct 2016 17:09:53 +0000 (17:09 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev
Selim Cinek [Tue, 11 Oct 2016 19:49:48 +0000 (12:49 -0700)]
Fixed an issue where the emergency affordance would show
If a device isn't voice capable, it shouldn't show the emergency
option.
Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug:
31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54
Martin Wallgren [Tue, 11 Aug 2015 13:10:31 +0000 (15:10 +0200)]
RRO: Synchronize access to overlays.list
idmap --scan is executed as a part of the pre-loading in ZygoteInit.
The pre loading is executed in parallel for each supported architecture
(32/64 bit). This will cause a race condition in the creation of the
overlays.list file and the idmap files for the system overlays.
Apply flock on overlays.list to prevent the file from being thrown away
and recreated when it is in use by another Zygote.
Cherry-picked from AOSP.
Bug:
28032298
Test: manual
Change-Id: I51d39f121d207b11181340b68b164b60020f0c61
Daniel Sandler [Wed, 12 Oct 2016 13:56:14 +0000 (13:56 +0000)]
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev am:
52cd2948a6
am:
bfc83493fe
Change-Id: I634618ab4cdebe58118a602387a0c561866b0089
Dan Sandler [Wed, 12 Oct 2016 13:55:17 +0000 (13:55 +0000)]
Essential packages' notifications can no longer be silenced. am:
028a60f003
am:
b50c46a64e
Change-Id: I12e95285baabe5356c3f04e17587afecd3caf292
Daniel Sandler [Wed, 12 Oct 2016 13:49:15 +0000 (13:49 +0000)]
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev
am:
52cd2948a6
Change-Id: I00c94e1299651f12e030904a77396b74e825d8d9
Dan Sandler [Wed, 12 Oct 2016 13:49:11 +0000 (13:49 +0000)]
Essential packages' notifications can no longer be silenced.
am:
028a60f003
Change-Id: Ic3e80d30c99e448c7719d5d40c9e957df94a6af6
Daniel Sandler [Wed, 12 Oct 2016 13:38:59 +0000 (13:38 +0000)]
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev
Erik Wolsheimer [Wed, 12 Oct 2016 05:13:00 +0000 (05:13 +0000)]
Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev
am:
56746f9830
Change-Id: I89b58af12ee5940ad3f4cbb93f9777eeb641df86
Erik Wolsheimer [Wed, 12 Oct 2016 05:12:55 +0000 (05:12 +0000)]
Change 2nd and later burn-in protection intervals to 2 mins
am:
3b3940d381
Change-Id: I65eb928e9d76df790826cd021753c240e957cdad
TreeHugger Robot [Wed, 12 Oct 2016 05:03:53 +0000 (05:03 +0000)]
Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev
Erik Wolsheimer [Tue, 11 Oct 2016 22:32:37 +0000 (15:32 -0700)]
Change 2nd and later burn-in protection intervals to 2 mins
BUG:
31855095
Change-Id: I969e24d2db882109855b74430b806247c4fbf6cb
Alan Viverette [Wed, 12 Oct 2016 01:42:54 +0000 (01:42 +0000)]
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev am:
d35d3c98e4
am:
250262a313
Change-Id: I61df0091ee1785947cb01fde77bda1a5a0460e31
Alan Viverette [Wed, 12 Oct 2016 01:42:06 +0000 (01:42 +0000)]
Add note about density scaling behavior to setImageURI am:
ac21e56f63
am:
74c6d9bd3f
Change-Id: I5b6f9d978d61aedac2c53dcf75dea449468d3c7b
Alan Viverette [Wed, 12 Oct 2016 01:36:36 +0000 (01:36 +0000)]
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev
am:
d35d3c98e4
Change-Id: Id6921412886e72fb70fdbb0b23806c88a6638ae4
Alan Viverette [Wed, 12 Oct 2016 01:36:33 +0000 (01:36 +0000)]
Add note about density scaling behavior to setImageURI
am:
ac21e56f63
Change-Id: I4a85ae20023dd0589227ca7684a965a246f451fd
Julia Reynolds [Wed, 12 Oct 2016 01:25:06 +0000 (01:25 +0000)]
Merge "Stop posting config asynchronously." into nyc-mr1-dev am:
6c816c6707
am:
331eea4900
Change-Id: Ica84c11c5edecc2deee90cfd580f60198aefcc9a
TreeHugger Robot [Wed, 12 Oct 2016 01:24:53 +0000 (01:24 +0000)]
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev
Julia Reynolds [Wed, 12 Oct 2016 01:24:02 +0000 (01:24 +0000)]
Stop posting config asynchronously. am:
3ebe72b26a
am:
532ebb02a7
Change-Id: I7698cde7696c967f9cd8659b3da50dbc9b4ea2bc
Doris Liu [Mon, 10 Oct 2016 22:50:01 +0000 (15:50 -0700)]
Fix SkShader leak for Gradient VectorDrawable and test
This CL fixes a SkShader leak in VD when applying local matrix
to the shader. Specifically, the usage of newWithLocalMatrix(...)
increments the shader's ref count in every draw() call for
Gradient VectorDrawable, whereas there's no balancing call to
decrement the ref count in draw(). In this CL, we assume
the ownership of the shader returned from newWithLocalMatrix(...)
to ensure the correct ref count management.
Also, add test to verify that shader is no longer being leaked
BUG:
32067647
Test: this CL
Change-Id: Ic15fe46cde06a73d81b44e2d3c56b51907344cc0
Julia Reynolds [Wed, 12 Oct 2016 01:18:37 +0000 (01:18 +0000)]
Merge "Stop posting config asynchronously." into nyc-mr1-dev
am:
6c816c6707
Change-Id: I1e30c8b770d6f3c719c3fcb2964c8ab30fa79542
Julia Reynolds [Wed, 12 Oct 2016 01:18:33 +0000 (01:18 +0000)]
Stop posting config asynchronously.
am:
3ebe72b26a
Change-Id: If0ebacf0a128d56c70178a03c1c2532d984c796e
TreeHugger Robot [Wed, 12 Oct 2016 01:10:56 +0000 (01:10 +0000)]
Merge "Stop posting config asynchronously." into nyc-mr1-dev
Kevin Hufnagle [Wed, 12 Oct 2016 00:46:36 +0000 (00:46 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
2f54d4301d am:
c9267a1f36
am:
de7f56a58a
Change-Id: Ide2f950b47c9c7a414d47bcc56c7ea8976e2a714
Kevin Hufnagle [Wed, 12 Oct 2016 00:45:39 +0000 (00:45 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
36838b070c am:
ee80c871d1
am:
6795dae4ce
Change-Id: Ifa7bee4f7e5d10c855d3e93ae5bd116e69a6e8a4
dooyoung.hwang [Tue, 4 Oct 2016 09:55:31 +0000 (18:55 +0900)]
Fix crashes after notifying bad notification
If applications whose targetSDK is below N build notification
without contentView, contentView is created at inside of build()
function in Notification.Builder. If application apply
removeAllViews to this contentView, Notification View can have
id 'status_bar_latest_event_content' without standard layout of
notification. When inflating this notification, SystemUI try to wrap
it with NotificationTemplateViewWrapper(its id is
'status_bar_latest_event_content'), and crash, because it does not
have expected views.
Test: Install & launch attached apk in below BUG url to N devices,
and try to make notification by clicking 'do it' button.
https://code.google.com/p/android/issues/detail?id=223479
Bug:
31948446
Change-Id: Ifcdc79a117613e8afd2e8ed098afd211cceabf88
Kevin Hufnagle [Wed, 12 Oct 2016 00:35:05 +0000 (00:35 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
2f54d4301d
am:
c9267a1f36
Change-Id: I17c778c5d7fa241610177d36297877e700a5c789
Christopher Tate [Wed, 12 Oct 2016 00:34:26 +0000 (00:34 +0000)]
Merge "Respect restoreAnyVersion=true in full-data restore path" into nyc-mr1-dev am:
cef0c6b5a5
am:
37f54083f0
Change-Id: I7b7483de2ecc212df6904f92b2817370b983a1c4
Kevin Hufnagle [Wed, 12 Oct 2016 00:34:14 +0000 (00:34 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
36838b070c
am:
ee80c871d1
Change-Id: I0d0a1f32cdd0761c8db3cf54f50d4a785b23b68b
Christopher Tate [Wed, 12 Oct 2016 00:33:24 +0000 (00:33 +0000)]
Respect restoreAnyVersion=true in full-data restore path am:
d990e4d3df
am:
f413e3f2fe
Change-Id: I3a02404754366c21a5bebf0bc47bb69ba40fa1c1
Chet Haase [Wed, 12 Oct 2016 00:32:28 +0000 (00:32 +0000)]
Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev am:
aea27e1aea
am:
8f8547f1ed
Change-Id: Ifa3dc3e3318f2b3f12ca3ad80f9a0c9787c82145
Chet Haase [Wed, 12 Oct 2016 00:31:31 +0000 (00:31 +0000)]
Fix small typo in ShortcutManager header docs am:
c158431f8e
am:
5aa0dfcc0a
Change-Id: Ia3a1a14cf561e6846245fa8265e96e954d8a185d
Kevin Hufnagle [Wed, 12 Oct 2016 00:26:14 +0000 (00:26 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120
am:
2f54d4301d
Change-Id: Ie57a23935c654bb098130daa86763fc052d657db
Kevin Hufnagle [Wed, 12 Oct 2016 00:25:24 +0000 (00:25 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5
am:
36838b070c
Change-Id: Ia77cf32efbd7d48bae6c0a7c1dff0219e7a3b4e0
Christopher Tate [Wed, 12 Oct 2016 00:21:14 +0000 (00:21 +0000)]
Merge "Respect restoreAnyVersion=true in full-data restore path" into nyc-mr1-dev
am:
cef0c6b5a5
Change-Id: Ia5507eaf4a1f0ded5ad26e08ee5ab52528ff02f9
Christopher Tate [Wed, 12 Oct 2016 00:21:10 +0000 (00:21 +0000)]
Respect restoreAnyVersion=true in full-data restore path
am:
d990e4d3df
Change-Id: Icf3e6bbfd0fa42707c317d114048d7fe66bf0844
Chet Haase [Wed, 12 Oct 2016 00:19:50 +0000 (00:19 +0000)]
Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev
am:
aea27e1aea
Change-Id: I2e2f4d46787c51617b486edb7774cdf18bcaf52f
Chet Haase [Wed, 12 Oct 2016 00:19:46 +0000 (00:19 +0000)]
Fix small typo in ShortcutManager header docs
am:
c158431f8e
Change-Id: I303576d842f92358e9c97714e71c0407d53df39b
Michael Kwan [Wed, 12 Oct 2016 00:19:42 +0000 (00:19 +0000)]
Merge "Fix issue where icon was not centered properly." into cw-f-dev
am:
6119c54b48
Change-Id: I112e499a1e12c62c63b6d6c9c4a3861e4e859e25
Kevin Hufnagle [Wed, 12 Oct 2016 00:19:40 +0000 (00:19 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev
am:
2acaf0a120
Change-Id: Ic31df60f13193b9a9ec89241ef5d14c9caa190e9
Kevin Hufnagle [Wed, 12 Oct 2016 00:19:37 +0000 (00:19 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs
am:
1965375aa5
Change-Id: I1cabf01b8339ef67a6167b540de698ffbda889e7
Michael Kwan [Wed, 12 Oct 2016 00:19:36 +0000 (00:19 +0000)]
Fix issue where icon was not centered properly.
am:
ac29ce3fe2
Change-Id: If291f92baa882798734136ca36476c23a451b10a
TreeHugger Robot [Wed, 12 Oct 2016 00:06:43 +0000 (00:06 +0000)]
Merge "Respect restoreAnyVersion=true in full-data restore path" into nyc-mr1-dev
Kevin Hufnagle [Tue, 11 Oct 2016 23:40:42 +0000 (23:40 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev
TreeHugger Robot [Tue, 11 Oct 2016 23:36:22 +0000 (23:36 +0000)]
Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev
Alan Viverette [Tue, 11 Oct 2016 21:42:21 +0000 (17:42 -0400)]
Add note about density scaling behavior to setImageURI
Bug:
27327999
Change-Id: I1e348a1fbda20fff9575261df7097fbd46381383
Michael Kwan [Tue, 11 Oct 2016 23:24:09 +0000 (23:24 +0000)]
Merge "Fix issue where icon was not centered properly." into cw-f-dev
Julia Reynolds [Thu, 15 Sep 2016 15:07:50 +0000 (11:07 -0400)]
Stop posting config asynchronously.
All of the instances of calling into other services with locks held
should be resolved, so this isn't needed anymore.
Test: have 2 rules end or start at the same time; ensure the resulting
state is correct.
Fixes:
28459870
Bug:
31980467
Change-Id: I3f12f1d3b8460361dab6fa9468f0ede55ca8dd5e
(cherry picked from commit
89aeab0e714ea8449c20816e6d2acea04c9348ca)
Nick Kralevich [Tue, 11 Oct 2016 23:00:12 +0000 (23:00 +0000)]
Merge "Delete unused broadcast receiver" into nyc-mr1-dev am:
1b4ad1c701
am:
0ead15f0be
Change-Id: I594c306bf5b35b06c0fd8e080ee10fc73290b550
Nick Kralevich [Tue, 11 Oct 2016 22:59:25 +0000 (22:59 +0000)]
Delete unused broadcast receiver am:
bee3ea12cc
am:
6c7d18bdb2
Change-Id: I4954ae213b18f629a5135cdd6e21270c0781b9a1
OSDN Git Service
