Merge commit 'e0a4068640cff64abcd3a70395ad461919b15ea6' into kraken
* commit 'e0a4068640cff64abcd3a70395ad461919b15ea6':
retool resize logic to use max dimension and max area.
Merge commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp
* commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a':
retool resize logic to use max dimension and max area.
Merge commit 'f04be52a382544ff8006e227c1578a219ba0f23e' into kraken
* commit 'f04be52a382544ff8006e227c1578a219ba0f23e':
For search suggestions in the search dialog, allow the 'title'
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp
* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
For search suggestions in the search dialog, allow the 'title'
- make the usage of VCardSourceDetector.
- simplyfy flag usage.
- remove unnecessary argument "canceled"
Change-Id: I6dd9723df7230be7478f6817c0ac2e6cbedc6ca7
Merge commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken
* commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
A little more improvement of the Service javadoc.
Merge commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken
* commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72':
Fix SntpClient to give accurate time info.
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp
* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
A little more improvement of the Service javadoc.
Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp
* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
Fix SntpClient to give accurate time info.
Old calc was off by 2x and was affected by the user-settable system clock. The error
came because it was calculating the offset between our clock and the NTP clock and the algebra
had two factors of the offset instead of the desired 1.
bug:2600010
Change-Id: I0856091d32b50e6909e4889fb98df819e0aeabbe
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.
MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.
Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
let the user specify an interface impl class to specify the actions
to take when db corruption is detected.
this class is specified when the database is opened/created.
Change-Id: I84eb57208c8fedfa7235805b0ec58165efdc1560
Merge commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73' into kraken
* commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73':
Dont fall back to installing on sdcard when internal storage is filled up
Merge commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c' into froyo-plus-aosp
* commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c':
Dont fall back to installing on sdcard when internal storage is filled up
when the install location is set to internal only. Similary if install
location is set to external only(via adb), dont fall back to installing on
internal storage if sdcard is filled up.
If nothing is specified ie install location is set to let system decide,
we just check on internal storage.
Fix tests
Change-Id: I7400ccc131782d9c45284bd9ebd0dee43a3b412b
-Show the generic avatar by default, until otherwise set
-Add padding to the nobadge asset so that it will be square
-Remove states from the nobadge asset since it is not actionable
Change-Id: Ide7da78782a0db9047de52af6f9c1f654fc6a1b5
Merge commit 'bad5f620df13ae41374e05cad0a391ab084664c4' into kraken
* commit 'bad5f620df13ae41374e05cad0a391ab084664c4':
verify database state before calling sqlite. Bug:2593970
Merge commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp
* commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63':
verify database state before calling sqlite. Bug:2593970
