Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken
* commit 'f9e90378d50210298d1cec2b913653597cd62be4':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp
* commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp
* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken
* commit '733a2f654934d452b2febf6f80cd1136830758d5':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
Fix a crash in BatteryStatsImpl, due to a previous fix.
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.
Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken
* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp
* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Look for corrupted bytes and replace with ?
If the problem is in the parsing code, then this will not help.
Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken
* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp
* commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
Fix 2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.
This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior. New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.
Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed
Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken
* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
Don't load photo if it's id is 0. Saves one database query
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp
* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
Don't load photo if it's id is 0. Saves one database query
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken
* commit '3e9032e646c898a725c256c90031494cc349eea0':
Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
Some applications are setting the MIME type field for an http:
intent, which is technically wrong because the recipient opening
the URI will get the MIME type from the header. This was hitting
a bug when we compute the intent filter when setting the
preferred activity, where we have to set both the MIME type and
data URI for the intent filter. (For file: and content: URIs
only the MIME type is needed, since these can be opened directly
through ContentResolver so everyone is presumed to be able to
handle them.)
Change-Id: Ia7025e6859e9c90997bf56c2c80f225fca7a2007
This is try to capture the case where we sometimes see UNSPECIFIED
MeasureSpec in SlidingTab. It should be OK as long as one of the dimensions
is constrained. The log event will give some indication of what's
going on when this happens.
This also fixes a bug where it was possible to not reset the mAnimating flag
in the Phone app.
Change-Id: Ibab1c944ec895a7c19d5a18cc67f6e4db716f685
Merge commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6' into kraken
* commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6':
Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
There was a really dumb bug that was causing us to not always apply
the new configuration. As a result of fixing this, there were new
glithes in the transition between car and regular mode, so further
work here to fix that. And since I was actually working during the
night and seeing night mode, I noticed how obnoxiously bright the
status bar is compared to the car home at night, so it now nicely
dims itself when we switch to the night config. Oh and in doing
that I also found and fixed a bug in dispatching config changes to
a window (where they wouldn't get dispatched if the window didn't
resize).
FINALLY... tweak the wallpaper enter/exit animations a bit to
make them a little smoother.
Change-Id: I4e062093cbcfbc919307799a794846db2920216f
The emergency call button has been removed (since the user
can disable the keyguard, open the phone app, and enter the
emergency number there).
AM/PM have also been baseline-aligned with the clock.
Bug: 2421380
Change-Id: I3fb25a29e02f3e2ee2b1505a8765d53ccceb1372
In addition, this change removes old lockpattern constants which were set
to DevicePolicyManager constants anyway.
Change-Id: I05f7f50ca099f4bd87a2d8e1d6dd2bc6f3a2b139
Also fixes how the quality vs. mode is handled to be more consistent, which also
required introducing a new "alphabetic" quality since it is possible for the user
to enter such a password.
The current password quality and length is stored in the DPM, since at boot it
couldn't figure this out from the stored password.
Change-Id: I519d9b76dd0b4431bcf42920c34dda38c9f1136e
Decouples the input dispatch thread from the battery-stats object lock regime,
to avoid the possibility of ever blocking the input dispatch thread on its
behalf. The stats object is widely used and can sometimes be locked for a
very long time (on the order of seconds) during certain extensive dump
operations.
This change does not alter the data format of the battery stats' externalized
representations.
Fixes bug #2530346
Change-Id: Iee288be3bf4936641b532dceecb8f6de8f552bf0
No steps to repro, but makes the code more robust by using the standard
JournaledFile class and doing sanity checks on the input it reads.
This required moving the JournaledFile class in to the framework (and
we really should get rid of either it or AtomicFile, but they have
different recovery semantics so that is tough). Also went through and
cleaned up the file management in various places.
Change-Id: Ieb7268d8435e77dff66b6e67bb63b62e5dea572e
