Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp
* commit '8f655cb6c836380778545fb13044d97ef57139d6':
Update the comment which supposed to be checked in
Basic implementation of an API for organizing a single activity into separate,
discrete pieces. Currently supports adding and removing fragments, and
performing basic lifecycle callbacks on them.
Change-Id: I6ea8e6bdb04d93f8105c2e983fe9b6532422de34
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken
* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
Remove fixed size restriction on the SurfaceView
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp
* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
Remove fixed size restriction on the SurfaceView
Merge commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3' into kraken
* commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3':
add droiddoc flag to include since-tags for api level 8
Merge commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp
* commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
add droiddoc flag to include since-tags for api level 8
Cleanup of duplicate code
Caching Ntp data so we don't hit the network as often
Clearing out of MRU data when we switch to a new sim
Sending notification after we reset byte counts
bug:2605277
bug:2605272
bug:2597530
bug:2576057
Change-Id: I3df526bae6374f6ae56fed67b0defad2b4fabefd
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken
* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
Force redraw in touch_up if there is a move.
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp
* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
Force redraw in touch_up if there is a move.
The value returned is purely a function of what's passed in, all
following final members.
BUG=2606839
Change-Id: I506fb9b1f3be965576c2b3317a30ff1f990ccda3
Merge commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken
* commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Merge commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp
* commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Previously, this status icon reflected just the incoming
call behavior:
- gone for audible (with or without vibrate),
- wiggling phone for vibrate,
- silent (speaker + X) for no audible ring or vibrate.
Now that silent mode has changed (see VIBRATE_IN_SILENT),
you can easily get into a state where this icon is
confusing by setting the incoming call ringer to *never*
vibrate but setting the overall device silent state to allow
vibration (VIBRATE_IN_SILENT=true). In this case, rocking
the volume all the way down would show a wiggling phone
(because the device is in vibrate-only mode) but the status
bar would show speaker+X (because the incoming call would
neither ring nor vibrate).
Now these two icons are consistent. This means, however,
that if this special condition is set by the user (device
vibrates in silent mode, but incoming calls should never
vibrate) and the device is in silent mode, the status bar
will show a wiggling phone even though incoming calls will
not vibrate the device. This puts the ringer on a more even
footing with other apps on the device, which may elect not
to vibrate even if VIBRATE_IN_SILENT=true overall.
Bug: 2598014
Change-Id: Ib942f68738d77ab0d9b9da4fac718ae5957c133c
Merge commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a' into kraken
* commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a':
Reset notification state on wifi enable
Merge commit '1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp
* commit '1892013643537f5fc330f5b0a02a0e9cb08b1134':
Reset notification state on wifi enable
Merge commit '6aa2accae3f58e4139f890f51c699901ee3abb88' into kraken
* commit '6aa2accae3f58e4139f890f51c699901ee3abb88':
Fix bug 2599698 Music paused by itself
