Merge commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9'
* commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9':
Revert volume if it wasn't okayed by user.
- 'setPermanentlyLocked(false)' no longer automatically resets the pattern
- new string for "waiting to verify account" progress dialog
- new string for account unlock screen title when you aren't past the too many
attempts, but just hit the 'forgot pattern' button
Merge commit 'c607435cae64d2f9c7af408e10e1e72eb637c458'
* commit 'c607435cae64d2f9c7af408e10e1e72eb637c458':
Add an extra intent parameter for recording duration limit.
Phase 2
Make VCard Importer use Data structures in ContactsContract instead of
using old Conatacts structure.
Phase 3
Developed VCardComposer, which was originally in Contacts package, but
now in base/core/java. Also made it use queryEntries() as per jsharkey's
suggestion.
Phase 4
Added VCardUtils and moved some common methods to it, some of which should be
in public API, but hidden for now.
Phase 5
Made VCardComposer emits (almost) valid vCard 3.0 data.
Confirmed with vCard data emitted by Mac.
Related issue:
1784580, 1728351, 1967349
Note:
Probable next step:
- Add "fast parse" mode in VCradBuilder, in which, VCardBuilder skip parsing the value of
each property. It will make the parsing faster.
-- Note that parsing the parameters of each entry cannot be skipped, since it may contains
the information about Encoding of the property. In other words, if the line is
in Quoted-Printable format, the next line may be the part of the property, not a
separated property, which should be parsed accordingly.
- Needs test
Merge commit '4ce07160ec6030b3afdd22867e39ca818c5e44c4'
* commit '4ce07160ec6030b3afdd22867e39ca818c5e44c4':
Don't use deprecated API in contact header widget.
Merge commit '7a47b54f13566892839da8edeac182bfc0f94bc9'
* commit '7a47b54f13566892839da8edeac182bfc0f94bc9':
Note net availability even when apn not enabled
Fixes a problem where mms apn was on when we lost the network (airplane mode) but mms was
off when airplane mode was turned off so it kept thinking we didn't have access and
future mms always failed.
bug: 2075145
Merge commit '964fd32a733e099e7daa15bbf44b3d2b7a1f3571'
* commit '964fd32a733e099e7daa15bbf44b3d2b7a1f3571':
I am getting tired of the java doc warnings, so fix them.
During orientation changes or homing, the volume is reverted. Also,
during pause/resume, the original and modified values are remembered and
restored if the dialog was up.
Merge commit '2f4f63b501dfd6cc934d2d8d62850b98b57c6bfc'
* commit '2f4f63b501dfd6cc934d2d8d62850b98b57c6bfc':
Add more control over a service's start state.
One of the problems I have been noticing is background services
sitting around running and using resources. Some times this is
due to the app developer doing this when they shouldn't, but there
are also a number of issues with the current Service interaction
model that make it very difficult (or impossible) to avoid
getting services stuck in the started state. This is a
change/enhancement to the Service API to try to address this.
The main change is that Service.onStart() has been deprecated,
replaced with a new Service.onStartCommand() that allows the
service to better control how the system should manage it. The
key part here is a new result code returned by the function, telling
the system what it should do with the service afterwards:
- START_STICKY is basically the same as the previous behavior,
where we usually leave the service running. The only difference
is that it if it gets restarted because its process is killed,
onStartCommand() will be called on the new service with a null
Intent instead of not being called at all.
- START_NOT_STICKY says that, upon returning to the system, if
its process is killed with no remaining start commands to
deliver, then the service will be stopped instead of restarted.
This makes a lot more sense for services that are intended to
only run while executing commands sent to them.
- START_REDELIVER_INTENT is like START_NOT_STICKY, except if
the service's process is killed before it calls stopSelf()
for a given intent, that intent will be re-delivered to it
until it completes (unless after 4 or more tries it still
can't complete, at which point we give up).
Change-Id: I978f5ca420d70023d1b5e7f97de639d09381f8ad
Merge commit '123d6f372fcd7bdc18245cac984005bab3d534af'
* commit '123d6f372fcd7bdc18245cac984005bab3d534af':
Fix a race condition for data change notification
Merge commit 'ce80db469b3b4c229445548bdaa46a74a28a2912'
* commit 'ce80db469b3b4c229445548bdaa46a74a28a2912':
Add resources to specify display rotation when in keyboard open or docked state.
Merge commit 'd0dcd1011617e4bed5c1f16f8c2c8f3a9fb7217b'
* commit 'd0dcd1011617e4bed5c1f16f8c2c8f3a9fb7217b':
Implement new title bar hiding/showing behavior.
Remove the code that hides the title bar when the page finishes loading.
When the user double taps, if it did not result in changing the viewing
mode (i.e. on a mobile site), send a message to the client so we can
toggle the title bar's visibility. Required for a change to
packages/apps/Browser
Change-Id: I0040fd183ce5673a4069e943f38eb31599c0ca7d
Merge commit 'decbc3dbc4d4d3c368319ae0784307b5182bd2fe'
* commit 'decbc3dbc4d4d3c368319ae0784307b5182bd2fe':
don't center zoom on size change if zoom is in progress
The onSizeChange code is called when the device is rotated and
when the title bar is hidden. In the latter case, it is in response
to the zooming transition from overview mode to reading mode, and
the zoom center should not be recomputed.
http://b/issue?id=2060720
Merge commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab'
* commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab':
Check for a null history item to avoid crashing.
