Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp
* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
provide link to backup guide above the fold
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread
* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
provide link to backup guide above the fold
- New API for iterating over history that will allow a better implementation
in the future.
- Now do writes asynchronously.
Also improve the documentation for Activity.onRetainNonInstanceState().
Change-Id: Idf67f2796a8868eb62f288bcbb2bad29876c8554
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp
* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
New error status for "destination file already exists".
Also changing the behavior of the local URI column slightly to better
match the spec -- it should return the client-provided destination so
that it's valid even if the download failed.
Change-Id: Ibf9c07519e647e677ebac8b334b9f2e930e47033
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp
* commit '5b930c49b12bdb1461a18491db768c642c38d498':
SIP: add config flag for wifi-only configuration.
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp
* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
Fix some drawing artifacts/bugs around overlays/text anchors
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp
* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
Improve power tracking of WIFI use.
We now distribute "wifi started" time across all apps that are
holding WIFI locks that cause it to be started. But only when
WIFI would not normally be running. Also have a mechanism to
distribute other WIFI work that has happened across those processes
based on their use.
Also fixed a bug where we were not retaining the CPU speed step
stats across boots...!
Change-Id: I00e3153b98429166273750512cc37e7975211ab9
Merge commit 'b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp
* commit 'b08013c312e3d849029a2f4c11889274c00f438d':
Added overlay support for drawing/responding to text anchors.
Overlays let views draw and respond to touch events outside of their
bounds. This allows selection anchors to be friendlier and easier to
grab. This is currently private API, pending further evaluation.
Added themes/styles for text selection anchors.
Added assets for text selection anchors as provided by UX. The
left/right anchors are currently not suitable for use. They are here
for bookkeeping and replacement later. The theme currently uses the
'middle' anchor asset for all three. This will be changed once assets
are ready.
Change-Id: I01b21e5ae90cab201f86f38f2f5eeaf2bd7f6bcd
Merge commit '0f5843069bd419fba4fb253986645dfbca0784b7' into gingerbread-plus-aosp
* commit '0f5843069bd419fba4fb253986645dfbca0784b7':
Fix Bluetooth Javadoc to clarify the maximum device name length.
The maximum length of a Bluetooth device name is 248 bytes using
UTF-8 encoding. Updated the Javadoc to clarify that the length is
limited by the number of UTF-8 bytes and not the number of characters.
Change-Id: I135671f5ee6c5eb6372f3fbbc5fccb02de65e6c4
Merge commit '08710dcd589432c5828cefce25e4b565b15de9a6' into gingerbread-plus-aosp
* commit '08710dcd589432c5828cefce25e4b565b15de9a6':
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
Merge commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34' into gingerbread-plus-aosp
* commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34':
fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
- Sensor handle can now be arbitrary instead of being limited to 0-31
- make sure to disable sensors only when no listener uses them anymore
Change-Id: If656c8c24d9827a7db1de3b3aa89961abb7def0c
Merge commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c' into gingerbread-plus-aosp
* commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c':
Kill off the remaining GC-specific system properties.
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp
* commit '478747181e0414d703076d4786b201718cd93d5b':
Support new URI structure for download provider.
Merge commit '4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp
* commit '4198cececf70bf034e12f19bb87f29cc29931c39':
Fix the rest of the javadoc warnings.
Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp
* commit '7747795af508354b3792e497e6a7b4bc749b4007':
These are not javadoc tags, they are annotations in sample code. Escape them properly.
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp
* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
Adding new assets for designers
Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp
* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
ContactsContract: update SipAddress to be multi-valued
This is step (1) of the device-side changes to deal with SIP addresses
becoming first-class objects in focus.
It'll be multi-valued in focus, so make it multi-valued on the device
(just like Phone, Email, Im, etc.)
Possible types are CUSTOM, HOME, WORK, and OTHER.
Also while I was in there, fixed the typo in "TYPE_MAINDEN_NAME" in the
Nickname class. (I can't remove it, since it's public API, so I added a
new constant with the correct spelling and deprecated the misspelled
one.)
Bug: 3004838
TESTED: on passion:
- Flashed this change onto a device that already had a contact with a
SipAddress, verified that it still shows up fine in the UI.
- Wiped data, rerean SetupWizard and logged in, made sure that SIP
addresses got synced down properly.
- Edited SIP address on the device, made sure it got correctly synced
up to the SIP user-defined field.
Change-Id: I6ecf551b64f87de03a7807e6212297d91f9e3981
