22096 Commits

Author SHA1 Message Date
Martin Sjolin
e74e7e2a08 Remove top panel in alert dialog if empty.
Remove the topPanel in the alert dialog if it is empty and
therefore invisible. This gives the dialog content more space, and it
makes dialog positioning on the screen correct.

Change-Id: I8ffd9bd9b2360b0ad4338c32c21ab69c055d66a0
2010-07-13 10:47:26 -07:00
Kenny Root
ba636df784 Allow ListPreference summary to use entry
Currently when ListPreferences are used in a PreferenceActivity, the summary
values are set to the same as the current index in mEntryValue. This patch
adds the ability for a string substitution to be used in the summary
which points to the corresponding entry in mEntries to aid in
localization.

For example a preference may be named "color" with the following attributes
in the locale "de" (German):

mEntryValues = { "red", "green", "blue" }
mEntries = { "rot", "grün", "blau" }
mSummary = "Die Farbe ist %1$s."

getSummary() returns "Die Farbe ist grün."

Change-Id: Iea169ac3d1c9d6290d853fc7c67a7c4c8a11bb90
2010-07-13 10:28:44 -07:00
Guang Zhu
abcdecc017 dependent change for "parse instrumentation result bundles" in sdk
Change-Id: Ie3708d30620a703909829c32f5599816cc52b3f6
2010-07-12 15:00:36 -07:00
Alex Yakavenka
35dbaf2c62 Cat: Move Stk imlpementation into Cat folder
Change-Id: I18e9e2cd11570b7ca3692fa08543fd5f1db2d1bd
2010-07-12 14:35:03 -07:00
Alex Yakavenka
4f1244e0de Ccat: Initial CCAT implementation
Launch Stk service for Cdma phone.

Change-Id: I1d0e00a3a31af59239b1355babb37f05cb7e5e07
2010-07-12 14:27:46 -07:00
Romain Guy
2594066787 Merge "Fixed a Documentation Error in the AsyncTask Contstructor" 2010-07-12 11:35:31 -07:00
Jean-Baptiste Queru
014568bf45 Merge "Fix hang when error in SIM card communication" 2010-07-12 11:14:56 -07:00
Christian Mehlmauer
b91a4c4f23 Fixed a Documentation Error in the AsyncTask Contstructor
Change-Id: Ic5fb9c613b9e358f1ea81996ee705831a77368db
2010-07-12 20:02:25 +02:00
Jean-Baptiste Queru
f0565ce75a Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
ac95a25409 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Jean-Baptiste Queru
eb678fb63d Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
Jean-Baptiste Queru
cb5357c43d Merge "update 404'd source.android.com URLs" 2010-07-08 16:25:03 -07:00
Kenny
36a86649db Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently
Change-Id: I67e5b1f6e4f855cc09dd76c251a86a06990b6499
2010-07-08 15:51:48 -07:00
Christian Mehlmauer
0df10e9b4e Documentation Bug (Issue 9557)
There was an issue in the Time.toMillis example.
Also removed some whitespaces so the file
applies to the Android coding Styleguide

Change-Id: Ic1383e506b30ff181c6e14a12f675b52e5c8ccbc
2010-07-06 20:42:22 +02:00
Johannes Carlsson
3372f2e259 Corrected buffer overflow when parsing /proc/wakelocks
The android_os_Process_parseProcLineArray in android_util_Process.cpp
writes up to buffer[endIndex]. This sometimes caused an assert to be
triggered in NewStringUTF when the output from /proc/wakelocks was
larger than 4096 bytes. The buffer was also increased in order to be
able to parse all wakelocks completely.

Change-Id: Idf8e66d61ad979377569048f59c3eee278b146db
2010-07-02 10:20:55 +02:00
Jean-Baptiste Queru
61af57bfc3 Merge "Fix missing NL" 2010-07-01 13:46:03 -07:00
Naveen Kalla
3d59f8b418 Correct VM number updation during MBDN refresh.
The voice mail number and voice mail tag are not getting updated properly
during MBDN refresh. When the data in MBDN EF is invalid, the voice mail
number and voice mail tag are unchanged. They retain their previous value
where as they should be null in this case.

Change-Id: Ic3b9cb4cdf3ee5d2a33fc7e47cac968e752a0940
2010-06-28 23:31:46 -07:00
Scott Main
f97683d1c1 am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into froyo-plus-aosp

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
2010-06-28 15:31:11 -07:00
Scott Main
337b0873f4 docs: update backup guide and bmgr tool
elaborate the guide to testing a backup agent and add links between the docs

Change-Id: I35f815d1848c6bd7c6bfaee214f333e35a6cb23c
2010-06-28 12:28:31 -07:00
Stefan Larsson
38a1054c1c Fix hang when error in SIM card communication
When there is a problem communicating with the RIL (e g when the SIM
card is not connected) the IccPhoneBookManager hangs. This is corrected.

Change-Id: I28cf6cd3b79a29f4784fdef2b5072af5533e53da
2010-06-28 08:45:40 +02:00
Naveen Kalla
2e896830f8 Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
Change-Id: Ic794ef8258138b903f83c5ed77a0ee09e75ca094
2010-06-26 23:18:03 -07:00
Naveen Kalla
213c853f40 Make hasIccCard return true if RUIM card is present.
Currently hasIccCard method works only for GSM phones with SIM/USIM
cards. Extend that to RUIM as well.

Change-Id: Iefbfc35025074e7414f4abdffea844e9e0325053
2010-06-26 22:52:39 -07:00
Chris Peterson
c05df82b36 update 404'd source.android.com URLs
Change-Id: I4d3d2ae267c9f6da9f4969b3970cfb923ce8ef2f
2010-06-25 17:32:20 -07:00
Christian Mehlmauer
10c543da2f Reduced Warnings by adding Type Arguments and removing unused imports
Change-Id: I42f8f9f9a6a6b271eaeb1a02f6d6567a630936ea
2010-06-25 21:29:34 +02:00
Christian Mehlmauer
a47130783b Replaced deprecated calls to setButton and setButton2
Change-Id: Ifcc3f3afc1689406a3298dab7b00a8edb83c115e
2010-06-25 20:03:42 +02:00
Christian Mehlmauer
e8db3a3f40 Replaced deprecated setButton Methodcalls
Change-Id: I8358b2dce25c6d5024550c54d98b4891f41b2a40
2010-06-25 20:01:03 +02:00
Christian Mehlmauer
5f5acca334 Improved logging when there's an error creating the directories in getFilesDir()
Improved logging when there's an error creating the
directories in getFilesDir();

Due to mkdirs() only returns false on errors,
it's better to output the directory path so the dev
knows the path that can not be created
See also Issue 8886
http://code.google.com/p/android/issues/detail?id=8886

Change-Id: I44d6adc8508ef9ca57f000b5d7bceeb0cfa3ed13
2010-06-25 19:06:18 +02:00
Bruce Beare
fd23461c2b Fix missing NL
Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-06-25 09:08:12 -07:00
Christian Mehlmauer
218284528b Fixed a documentation Bug (Issue 9236)
Change-Id: I898b352f2b2f6b059ccd4a44c30e61c9dfdab9ec
http://code.google.com/p/android/issues/detail?id=9236
2010-06-25 16:31:05 +02:00
Scott Main
da3b02c6bc am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:14:06 -07:00
Scott Main
56c778e6cf Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Scott Main
654d9414de docs: Remove the TOS from download flow and remove TOS entirely because
it's no longer relevant to the SDK download package

Change-Id: I5f0b2b6258db1f09f300567fc0d22b5e3effd324
2010-06-24 17:29:13 -07:00
Dianne Hackborn
14694eb9ae am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
2010-06-24 16:02:03 -07:00
Dianne Hackborn
5827d3eaf3 Merge "Properly note the current active restore set's token" into froyo 2010-06-24 16:00:06 -07:00
Christopher Tate
2950555aac Properly note the current active restore set's token
Bug: 2796780
Change-Id: Iad601ed96ae73cf34910a276350712e6af19bb4e
2010-06-24 15:58:01 -07:00
Nick Pelly
cb2555ebb6 am d19c397b: Merge "Do not log AT command traffic by default." into froyo
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp

* commit 'd19c397b04f485e0af5990f3541e703934869290':
  Do not log AT command traffic by default.
2010-06-24 11:55:56 -07:00
Nick Pelly
d19c397b04 Merge "Do not log AT command traffic by default." into froyo 2010-06-24 11:52:39 -07:00
Nick Pelly
801dbe26ee Do not log AT command traffic by default.
Bug: 2792732
Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
2010-06-24 11:48:54 -07:00
Scott Main
a5bd886af3 am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into froyo-plus-aosp

* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
  docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:08:45 -07:00
Scott Main
753e56090e Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 2010-06-23 09:57:46 -07:00
Scott Main
964384962d docs: update backup dev guide with Android Backup Service registration info
Change-Id: I16696abbd517a5a740ff641ca0b17ffafbcf4993
2010-06-22 19:26:16 -07:00
Dirk Dougherty
dd1880ee5b am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Merge commit '17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp

* commit '17ae646586663c59ad360bb72884beded7475687':
  Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:24:01 -07:00
Dirk Dougherty
17ae646586 Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo 2010-06-22 11:13:48 -07:00
Dirk Dougherty
a767076f46 Doc change: Fix description of certificate matching requirement for app updates.
Change-Id: I38a0b997f5cb634bfdab1c0ecaa2b0d19e68256a
2010-06-21 16:22:06 -07:00
Kenny Root
584bd35aba am 30cf330f: Import revised translations
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
2010-06-21 11:16:25 -07:00
Kenny Root
30cf330fae Import revised translations
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
2010-06-21 11:03:50 -07:00
Kenny Root
e364122555 am c4e38577: Import revised translations
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
2010-06-21 09:15:29 -07:00
Kenny Root
c4e38577f4 Import revised translations
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
2010-06-20 18:54:45 -07:00
The Android Open Source Project
f1f33c4eb2 merge from open-source master
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
2010-06-18 12:46:16 -07:00
The Android Open Source Project
766d1b7458 merge from open-source master
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
2010-06-18 12:44:20 -07:00