OSDN Git Service
Selim Cinek [Fri, 22 Jan 2016 07:11:47 +0000 (23:11 -0800)]
Fix build by adding missing method
Change-Id: I4309225f9c799237857ce4c8f7ae2f8667d0b8be
Keisuke Kuroyanagi [Fri, 8 Jan 2016 10:05:27 +0000 (19:05 +0900)]
Add TextView cursor positioning tests for grapheme clusters.
Bug:
25375561
Bug:
25730231
Change-Id: I7e77e6de027a81ec0f203a1ff9c24a768ffedae3
Keisuke Kuroyanagi [Fri, 22 Jan 2016 05:09:16 +0000 (05:09 +0000)]
Merge "Use light weight method for text measurement."
Tomasz Mikolajewski [Fri, 22 Jan 2016 04:58:21 +0000 (04:58 +0000)]
Merge "Do not allow to move virtual files using conversion."
Tomasz Mikolajewski [Thu, 21 Jan 2016 03:49:24 +0000 (12:49 +0900)]
Do not allow to move virtual files using conversion.
Change-Id: Ia792bc766272645f7bf8a2683c22895b03df3a1f
Youngsang Cho [Fri, 22 Jan 2016 03:46:58 +0000 (03:46 +0000)]
Merge "Use ActivityOptions.setLaunchBounds to resize PIP"
Youngsang Cho [Thu, 21 Jan 2016 22:30:31 +0000 (14:30 -0800)]
Use ActivityOptions.setLaunchBounds to resize PIP
Bug:
26574470
Change-Id: I5444ae40a51cf2746d78b4c006e5936c91d01ae4
Selim Cinek [Sat, 16 Jan 2016 01:17:58 +0000 (17:17 -0800)]
Fixed a bug where the wrong number of notifications were visible
Since the calculation of the number of notifications is dynamic now
it strongly depends on the notification min heights which are only
calculated once it is laid out.
This is now properly done.
Bug:
26480961
Change-Id: Ic7b270af826c28b4a9d2c08021605a5c9ae78860
Selim Cinek [Sat, 16 Jan 2016 00:33:22 +0000 (16:33 -0800)]
Handling content intent of groups correctly
Content intent of children in groups can now
only be launched if the group is expanded.
Bug:
26582343
Change-Id: I5bf2c853d7659b4c764892409c6c7cc3fc647cc8
Selim Cinek [Fri, 15 Jan 2016 23:07:06 +0000 (15:07 -0800)]
Switched the work profile badge used in the notifications
Change-Id: I62616f1ae8fcda9953853b9859c69a9f1e6f44ca
Selim Cinek [Fri, 15 Jan 2016 02:48:41 +0000 (18:48 -0800)]
Fixed that music notifications were not clickable on lockscreen
On the lockscreen we were unintentionally disabling single clicks
on the media buttons while we only wanted to disallow it for the
notification header. This is now fixed by explicitly checking if
we are clicking on the notification header.
Bug:
26325096
Change-Id: I044f25ac3216b98c7769c31d09d19f801a437194
Selim Cinek [Fri, 15 Jan 2016 01:04:47 +0000 (17:04 -0800)]
Fixed the animation on the music template by introducing scale
The notification images can now animate in scale.
Change-Id: I7cc90e13f31208c76a490dd94a1ccbc05a4f8bd3
Selim Cinek [Thu, 14 Jan 2016 21:02:21 +0000 (13:02 -0800)]
The notification content now switches earlier
The notification content visible is now based on the intrinsic
height of the view and not just the actual height anymore.
This allows notifications to switch earlier when clicking on
the collapse button.
Change-Id: Icdf4ea50a7b1bbb78bd57a9f1c3eea25cf9c8d7c
Selim Cinek [Wed, 13 Jan 2016 23:27:30 +0000 (15:27 -0800)]
Changed the work profile appearance
Change-Id: I0545ee9b18572b93f73b4cf54126cf03085b61b5
Selim Cinek [Wed, 13 Jan 2016 04:17:48 +0000 (20:17 -0800)]
Updated notification colors
Change-Id: I23ffc7325ec4947bb0e2d767d1e2ddbaa9b3f369
Selim Cinek [Wed, 13 Jan 2016 02:32:11 +0000 (18:32 -0800)]
Fading out the divider now when removing children
Change-Id: I4466da4f82ae4868c6d0bd023a399c6067a9c3fb
Selim Cinek [Wed, 13 Jan 2016 01:51:35 +0000 (17:51 -0800)]
Removed staggering animation with notification groups
It was more distracting than helping
Change-Id: I5a1110268d23d9f964ad515b6fff16cf9d9a4992
Selim Cinek [Wed, 13 Jan 2016 00:04:21 +0000 (16:04 -0800)]
Fixed a bug where Sysui could crash
If no title was provided, SysUI could crash in a
group.
Change-Id: I9c40175b3e40410ce5b1e8fe1ef7e6c7124b0460
Selim Cinek [Wed, 13 Jan 2016 00:02:42 +0000 (16:02 -0800)]
Added the possibility to do custom animations for certain fields
The text of the single line version now doesn't animate over anymore.
Change-Id: Id41c1145cbb07254bff599b10d4d6df84689f797
Selim Cinek [Tue, 12 Jan 2016 02:01:47 +0000 (18:01 -0800)]
Fixed a bug where the dozemode wasn't working correctly
There where 2 different issues which could lead to the dozemode
not working correctly:
1. The new workarabout where we show the expanded notification
if it has the same size as the collapsed, requires that dozemode
is also called on the right notification
2. When the children were not layed out yet, this calculation could be
wrong and the wrong child was selected, leading to the same issue.
Bug:
26459664
Change-Id: Ib67dcaf2ba9b8b9a1bfa5ece5b7d6c4dff677939
Selim Cinek [Tue, 12 Jan 2016 00:58:37 +0000 (16:58 -0800)]
Fixed an inconsistency in the notification templates
The text was never set to GONE when it was invisible,
leading to weird cases when fading between notification contents.
Change-Id: I92825b6d5a417c968c734061e55553be314af2b8
Selim Cinek [Sun, 3 Jan 2016 06:42:02 +0000 (14:42 +0800)]
Improved notification transformations
All views are now faded, even if they are not handled specially
Change-Id: I2970548667e0388984098293ac0dfcbdbed12df1
Selim Cinek [Fri, 1 Jan 2016 19:29:12 +0000 (20:29 +0100)]
Continued the template switch implementation
Change-Id: I86fa52f2e13d319127dcd44b98304aa3cc3c7e9e
Selim Cinek [Tue, 29 Dec 2015 14:12:23 +0000 (15:12 +0100)]
Changed the transformation from when switching notification views
Change-Id: I2af3c2f36787d208be7745dabae96903df256156
Selim Cinek [Mon, 28 Dec 2015 11:48:15 +0000 (12:48 +0100)]
Fixed a bug where the overflow card appear animation would get stuck
Bug:
24547258
Change-Id: I50a9404c7b9cced0e2e1a2e39ffaaf0d8bf2dfb9
Selim Cinek [Mon, 28 Dec 2015 11:15:01 +0000 (12:15 +0100)]
Fixed a bug where disabled notification actions were not centered
Bug:
26291178
Change-Id: If0ad1ab9d7a4cea3481b4d8cc06142a6b58146e7
Selim Cinek [Tue, 22 Dec 2015 00:55:58 +0000 (16:55 -0800)]
Isolating heads up children from their groups now
Group children are now isolated into their own group for a few seconds
until it's merged into the group again when they are
heads upped. This makes notifications groups finally usable with
HUNs again.
Change-Id: I0cb5e4f7a70e09989030dfe70ddcbb50575c1c02
Selim Cinek [Mon, 21 Dec 2015 20:19:09 +0000 (12:19 -0800)]
Improved touch handling with groups and HUNS
Groups with HUNED children now don't totally destroy the touch
handling anymore.
Change-Id: I815260e22c59e939de12315a393de108fc0b47ab
Selim Cinek [Sat, 19 Dec 2015 02:38:31 +0000 (18:38 -0800)]
Fixed the animations on the notification scrims
When pulling down on a heads up notification the scrim would
fade in from 0 instead of fading to the new position.
The old behavior didn't work if the heads up notifications were
big, so we had to change it in order to always have a scrim.
Change-Id: I9ae387b75136c9240d863e06a8649c85b3c6c9dc
Selim Cinek [Sat, 19 Dec 2015 01:51:15 +0000 (17:51 -0800)]
Enabled usage of expand button in heads up notifications
Heads up notifications can now be expanded with the expand
button. The notification stays there until the user dismisses it
or collapses it again.
Change-Id: I0f1b729915317bbbd6f13c3d968c933ffbe6feeb
Ben Kwa [Fri, 22 Jan 2016 03:30:34 +0000 (03:30 +0000)]
Merge "Make Drag and Drop mouse specific behavior for now."
Jorim Jaggi [Fri, 22 Jan 2016 02:54:21 +0000 (02:54 +0000)]
Merge changes Ifd2de38a,I57633d60
* changes:
Divider tuning
Fix unneccesary activity relaunches
Winson Chung [Fri, 22 Jan 2016 02:26:22 +0000 (02:26 +0000)]
Merge "Fixing some small issues with the overlay."
Winson [Fri, 22 Jan 2016 02:14:12 +0000 (18:14 -0800)]
Fixing some small issues with the overlay.
- Should be updating the app text color to match the activity text color
- Fixing issue with indicator showing when fast toggle is disabled but
the indicator flag is enabled
- Tweaking layout so that the buttons are flush with the borders so that
we capture the full area for press/long press
Change-Id: Ia9b081883562ef4fd1c01fd42bc786a1feeb0854
Ben Kwa [Fri, 22 Jan 2016 02:09:07 +0000 (02:09 +0000)]
Merge "Fix band selection problems."
Ben Kwa [Wed, 20 Jan 2016 23:07:53 +0000 (15:07 -0800)]
Fix band selection problems.
- Remove whitespace from the GridModel, which isn't set up to deal with
it.
- Use absolute column bounds whenever translating the band rectangle
into column indices. This necessitates additional binary searching,
but is necessary when columns aren't fully populated, which happens
with the new grid layout.
BUG=
26512327
Change-Id: I5016d5de8f00c366f575f0722739007ac1612923
Anthony Chen [Fri, 22 Jan 2016 01:49:15 +0000 (01:49 +0000)]
Merge "Move hard-coded dimens to dimens.xml."
John Reck [Fri, 22 Jan 2016 00:46:34 +0000 (00:46 +0000)]
Merge "resolve merge conflicts of
32a95af029 to "
John Reck [Fri, 22 Jan 2016 00:45:31 +0000 (16:45 -0800)]
resolve merge conflicts of
32a95af029 to master.
Change-Id: I35b7cea1d34cb24f431ba2b76433a5b0ef1cb602
Vladislav Kaznacheev [Fri, 22 Jan 2016 00:41:57 +0000 (00:41 +0000)]
Merge "Zero out DragEvent position when it should not be available"
Michael Wright [Fri, 22 Jan 2016 00:31:40 +0000 (00:31 +0000)]
Merge "Add choreographer API to the NDK."
Michael Wright [Fri, 4 Dec 2015 17:59:42 +0000 (17:59 +0000)]
Add choreographer API to the NDK.
Change-Id: Icb8cffd3cd3bd06814466be72db3e26f6a62cbc6
Jean-Michel Trivi [Fri, 22 Jan 2016 00:30:08 +0000 (00:30 +0000)]
Merge "Unhide audio recording notification API"
Tomasz Mikolajewski [Fri, 22 Jan 2016 00:27:37 +0000 (00:27 +0000)]
Merge "Fix notifications for failures when copying/moving."
Jorim Jaggi [Sat, 16 Jan 2016 06:40:13 +0000 (22:40 -0800)]
Divider tuning
- Make it harder to dismiss
- When dragging from the bottom, don't allow dismissing at the top
Change-Id: Ifd2de38abece7b996a813af41dcf777fa5cd1c18
Vladislav Kaznacheev [Fri, 22 Jan 2016 00:24:40 +0000 (16:24 -0800)]
Zero out DragEvent position when it should not be available
Bug:
26729675
Change-Id: I46507198deea89c100cb1b99a1ab7ec0719efb12
Filip Gruszczynski [Fri, 22 Jan 2016 00:17:55 +0000 (00:17 +0000)]
Merge "Mark window as replacing when moving task to pinned stack."
Steve McKay [Thu, 21 Jan 2016 23:10:39 +0000 (15:10 -0800)]
Make Drag and Drop mouse specific behavior for now.
We'll implement "photos style selection" for touch behaviors.
Autosubmit? Yes, please?
Bug:
20556237
Change-Id: I60dfc2504f2f9fb1dec6e8e311122dd0e2f484fe
Jorim Jaggi [Sat, 16 Jan 2016 06:54:46 +0000 (22:54 -0800)]
Fix unneccesary activity relaunches
When going from fullscreen to non-fullscreen configuration, task config
changes was always non-zero because in fullscreen, task override config
was empty. Instead, use the actual previous configuration to calculate
diff.
Also make recents handle screenLayout changes.
Bug:
26593320
Change-Id: I57633d60b1e0fc4ae506e276410191a44e1fe221
Winson Chung [Fri, 22 Jan 2016 00:11:52 +0000 (00:11 +0000)]
Merge changes I91c58397,I7243f30b,I0f6e9dbf,I1eb0864a
* changes:
Adding reveal transition to show app-overlay.
Fixing issue with multiple focus timer animations running.
Fixing several regressions with affiliated tasks.
Starting the dismiss animation in parallel with the gesture.
Winson [Thu, 21 Jan 2016 22:39:23 +0000 (14:39 -0800)]
Adding reveal transition to show app-overlay.
- Instead of long-pressing the icon to launch into app info directly,
this will mirror notifications and reveal a space that can show the
app name and a link to app info.
Change-Id: I91c5839719b030a65744f5e677a436e9c719c578
Winson [Thu, 21 Jan 2016 01:11:29 +0000 (17:11 -0800)]
Fixing issue with multiple focus timer animations running.
Change-Id: I7243f30b917bb311e46efa1e09b44440a0236f07
Winson [Wed, 20 Jan 2016 20:43:35 +0000 (12:43 -0800)]
Fixing several regressions with affiliated tasks.
- Now that we are sorting tasks for freeform and history, ensure that
the affiliated tasks have a useful active time (based on the task
they are affiliated with) for sorting
- Fix issue with the initial stack and focus state not taking the
launch task into account due to the launchTask flag not being set
until the activity was started (now set in RecentsTaskLoadPlan)
- Fixing issue with affiliated tasks not being launched from the stack
due to the animation trigger not firing when the action button is
already hidden/visible
- Fixing issue with title text being occasionally hidden (something we
only need for freeform tasks)
- Tweaking the launch/enter animations for tasks occluded affiliated
tasks
Bug:
26685208
Change-Id: I0f6e9dbf8deec2e4fc15364e686367cc0f57b41f
Winson [Tue, 19 Jan 2016 23:07:07 +0000 (15:07 -0800)]
Starting the dismiss animation in parallel with the gesture.
- Introduces notion of ignored tasks for the purposes of layout in
TaskStackView. This can be used during drag and drop, and while
dismissing to calculate the state of the stack without the task that
the user is currently interacting with.
- Fixing minor layout issue when the front/back task transforms are
improperly calculated when there is a single task
- Fixing minor issue when the anchor task is calculated incorrectly when
dismissing task views
Change-Id: I1eb0864a52e53562e4d573a6ed4f8a5a1615aff9
Adam Powell [Fri, 22 Jan 2016 00:01:41 +0000 (00:01 +0000)]
Merge "Don't show TextView "share" option for an unprovisioned device"
Calin Juravle [Thu, 21 Jan 2016 23:47:23 +0000 (23:47 +0000)]
Merge "Clean up passing volumeUuid to DexOptimizer"
Calin Juravle [Thu, 21 Jan 2016 19:41:42 +0000 (11:41 -0800)]
Clean up passing volumeUuid to DexOptimizer
The argument was redundant.
Also, we should have taken the uuid for shared library from their
package information.
Bug:
26080105
Change-Id: If3d86e00ebecfc13cf63482bce4ac32a119de967
Anthony Chen [Thu, 21 Jan 2016 23:41:45 +0000 (23:41 +0000)]
Merge "Add null checks for various buttons on the Nav Bar."
Makoto Onuki [Thu, 21 Jan 2016 23:39:07 +0000 (23:39 +0000)]
Merge "[FBE] Introduce shadow calllog provider [1/2]"
Makoto Onuki [Tue, 12 Jan 2016 20:57:25 +0000 (12:57 -0800)]
[FBE] Introduce shadow calllog provider [1/2]
Introduce a new provider that's a clone of the calllog provider but
is EA.
The provider is hidden and requires MANAGE_USERS to access.
Bug
26183949
Change-Id: Ie3181a2a68c522b7e513b45218ad06ecd27cda8c
Bryce Lee [Thu, 21 Jan 2016 22:29:42 +0000 (14:29 -0800)]
Improve logging in BluetoothHeadsetClientCall.
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
(cherry picked from commit
fe985fa7f0286df0317b139a375fa8ee36e6a304)
Jean-Michel Trivi [Wed, 13 Jan 2016 02:27:17 +0000 (18:27 -0800)]
Unhide audio recording notification API
Introduce new methods and classes for the audio recording
configuration update and query API.
Callback registration supports a Handler.
Bug
22876530
Change-Id: I819ad464f095d970b5d1d8a3781fcf8dbb310424
Anthony Chen [Wed, 20 Jan 2016 00:57:20 +0000 (16:57 -0800)]
Add null checks for various buttons on the Nav Bar.
CarNavigationBarView extends NavigationBarView and provides a different
layout for the navigation bar which does not include all these buttons.
As a result, SystemUI will crash.
Change-Id: I1be079814faa26925721ec86a6f108506f54b99e
Santos Cordon [Thu, 21 Jan 2016 22:35:52 +0000 (22:35 +0000)]
Merge "Add metadata for car-mode in-call."
Anthony Chen [Fri, 8 Jan 2016 18:31:46 +0000 (10:31 -0800)]
Move hard-coded dimens to dimens.xml.
This is an initial change to allow the values to be overridden by
Android Auto.
Change-Id: Iaa611b6ff2ce0aa00d93776e775905c786802ef2
Roozbeh Pournader [Thu, 21 Jan 2016 22:17:31 +0000 (22:17 +0000)]
Merge "Implement smarter locale resource selection"
Adam Lesinski [Thu, 21 Jan 2016 22:13:15 +0000 (22:13 +0000)]
Merge "AAPT2: Accept empty zip files"
Santos Cordon [Fri, 11 Dec 2015 01:29:54 +0000 (17:29 -0800)]
Add metadata for car-mode in-call.
Change-Id: Ic2d55889e0ab65195bee549837b51c581ce5076a
John Reck [Thu, 21 Jan 2016 22:08:44 +0000 (22:08 +0000)]
Merge "libhwui: fix texture memory leak"
am:
550d46d9da
* commit '
550d46d9dae8a4de5abd36a5e2d3c101135da696':
libhwui: fix texture memory leak
Doris Liu [Thu, 21 Jan 2016 21:49:54 +0000 (21:49 +0000)]
Merge "Create SkCanvas on the stack to avoid leaking memeory"
Chong Zhang [Thu, 21 Jan 2016 21:48:55 +0000 (21:48 +0000)]
Merge "Fixes for broken saved surface"
John Reck [Thu, 21 Jan 2016 21:48:24 +0000 (21:48 +0000)]
Merge "libhwui: fix texture memory leak"
Roozbeh Pournader [Fri, 15 Jan 2016 19:23:42 +0000 (11:23 -0800)]
Implement smarter locale resource selection
* Add support for determining script from language and region.
* Add support for determining special parents of locales.
* Add support for smart comparison of locales with only a difference
in region, using the locale parentage tree.
* Fix LocaleData.matchScore() to not fallback to old locale matching
behavior if we can't determine a script.
* Allow four-character variant codes. (Previously, only five- to
eight-character variant codes were allowed.)
Bug:
7296673
Bug:
26589793
Change-Id: Ibde0a48c0564ff383b41068095a5cbacfe7b94bc
Steve McKay [Thu, 21 Jan 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Move delete support into FileOperationService."
Makoto Onuki [Thu, 21 Jan 2016 21:36:45 +0000 (21:36 +0000)]
Merge "SUW shouldn't use hidden APIs."
Makoto Onuki [Thu, 21 Jan 2016 21:34:59 +0000 (21:34 +0000)]
Merge "Add missing system broadcast actions to the protected list."
Chong Zhang [Thu, 21 Jan 2016 03:52:22 +0000 (19:52 -0800)]
Fixes for broken saved surface
- Reset and restore the visibility flags and hasSurface states when
surface is saved or restored. When the surface is in saved stated,
we have to make the rest of the system believe that the window has
no surface.
- Set app windows to 'mExiting' when we start a transistion because
window manager changes the visibility of the app. We can't rely on
receiving a relayoutWindow from the app to invisible. We need to
mark it exiting so that when the transition is done, the surfaces
get removed (or saved if possible) promptly.
- We need to save the surface if the app token is the last one in
a task, regardless of whether it's visible, this means the whole
task is going into background. But if the app has another visible
token on top of it, we don't need to save it. For example one
activity launches another activity, in this case we don't want to
save the surface of the activity on the bottom.
bug:
26573100
Change-Id: Id845f87b30cda1cebcc12ad2ac8dbf19a068a86e
Ben Kwa [Thu, 21 Jan 2016 21:28:46 +0000 (21:28 +0000)]
Merge "Rework selection handling for items in the DirectoryFragment."
Vladislav Kaznacheev [Thu, 21 Jan 2016 21:26:11 +0000 (21:26 +0000)]
Merge "Send ACTION_DRAG_LOCATION right after ACTION_DRAG_STARTED"
Doris Liu [Thu, 21 Jan 2016 20:55:54 +0000 (12:55 -0800)]
Create SkCanvas on the stack to avoid leaking memeory
Bug:
26447978
Change-Id: Ied022c103c3b08e9cfc3cb775a8c95fd5461e81d
Oleksandr Peletskyi [Thu, 21 Jan 2016 20:25:46 +0000 (20:25 +0000)]
Merge "Added restriction if a user is allowed to change the icon. BUG:
25305966"
Ben Kwa [Fri, 15 Jan 2016 18:43:24 +0000 (10:43 -0800)]
Rework selection handling for items in the DirectoryFragment.
- Remove the gesture detector from the MultiSelectManager, and
consolidate gesture detection and event dispatch logic in
DirectoryFragment.GestureListener.
- Route single-tap events through the DocumentHolder, so that it can
apply view-specific logic, like making a tap on the item's icon
select rather than activate.
- Consolidate event handling logic in the ItemEventListener.
- Add new unit tests for DocumentHandler.
BUG=
24326546
Change-Id: Id15cdd11b13e4c063c1baff95aa8ee09c190d6c3
Makoto Onuki [Thu, 21 Jan 2016 20:17:14 +0000 (12:17 -0800)]
Add missing system broadcast actions to the protected list.
Bug
26697573
Change-Id: I39e6b90b38c6e1dbe4978be1cb2a10d72b015cba
Steve McKay [Wed, 20 Jan 2016 23:09:35 +0000 (15:09 -0800)]
Move delete support into FileOperationService.
Refactor Jobs to work with files from multiple providers.
Don't shut down threadpool until service#onDestroy is called.
Bug:
26696797,
26462789,
26567205,
25162803,
26714663
Change-Id: Id43e8e3dc2294cd07dcd6a3477b19efb298c260f
Matt Wu [Thu, 21 Jan 2016 20:09:36 +0000 (20:09 +0000)]
Merge "Set WindowSession's touchmode when in local focus mode,"
Oleksandr Peletskyi [Mon, 18 Jan 2016 14:40:21 +0000 (15:40 +0100)]
Added restriction if a user is allowed to change the icon.
BUG:
25305966
Change-Id: I3d527224f00087b2bd959879ebb143e2ecb9c914
Alan Viverette [Thu, 21 Jan 2016 19:49:00 +0000 (19:49 +0000)]
Merge "Remove unnecessary @inheritDoc, add missing @Override to ViewGroup"
Matthew Williams [Thu, 21 Jan 2016 19:30:43 +0000 (19:30 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e am:
4831ef3872 am:
d877135d61
am:
caf53acdd7 -s ours
* commit '
caf53acdd7d4d1c2ec4d5678aa9b6a1c5c1340f8':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:25:51 +0000 (19:25 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e am:
4831ef3872
am:
d877135d61
* commit '
d877135d616321b4b3013b302e8615a8f8b04ffa':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:20:31 +0000 (19:20 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e
am:
4831ef3872
* commit '
4831ef3872f7f5c5d2ea0838f0958412e3833aeb':
DO NOT MERGE Redact Account info from getCurrentSyncs
Adam Powell [Thu, 21 Jan 2016 19:19:01 +0000 (19:19 +0000)]
Merge "Init child fragments consistently with activity fragments"
Phil Weaver [Thu, 21 Jan 2016 19:17:48 +0000 (19:17 +0000)]
Merge "Pass drawing order information to accessibility."
Matthew Williams [Thu, 21 Jan 2016 19:13:32 +0000 (19:13 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e
am:
c151cec56e
* commit '
c151cec56ec3666b5bb20e8cf7c3dca2500ea353':
DO NOT MERGE Redact Account info from getCurrentSyncs
Siyamed Sinir [Thu, 21 Jan 2016 19:12:28 +0000 (19:12 +0000)]
Merge "Sort the result of SpannableStringBuilder.getSpans"
Matthew Williams [Thu, 21 Jan 2016 19:08:07 +0000 (19:08 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d
am:
08d7e9608e
* commit '
08d7e9608ea822815b15be15a66f26be664ce541':
DO NOT MERGE Redact Account info from getCurrentSyncs
Adam Lesinski [Thu, 21 Jan 2016 19:04:46 +0000 (11:04 -0800)]
AAPT2: Accept empty zip files
The libziparchive returns an error on empty zip files.
Work around this by checking for that error condition and
returning an empty ZipFileCollection.
Change-Id: I9edaf2e089456b6ccb4bb099b20ede10331bd352
Kenny Guy [Thu, 21 Jan 2016 19:04:20 +0000 (19:04 +0000)]
Merge "Update PackageMonitor and LauncherApps for suspended apps."
Matthew Williams [Thu, 21 Jan 2016 19:01:02 +0000 (19:01 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours
am:
5cb2597a9d
* commit '
5cb2597a9da3202229fdbc91c12b8e172b2b5667':
DO NOT MERGE Redact Account info from getCurrentSyncs
Sergey Poromov [Thu, 21 Jan 2016 18:55:28 +0000 (18:55 +0000)]
Merge "Introduce BackupManager#requestBackup & BackupObserver API"
Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2
am:
1f6dbd910b -s ours
* commit '
1f6dbd910bf9bf93df8a708209e92add61fbff44':
DO NOT MERGE Redact Account info from getCurrentSyncs