summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Allow ListPreference summary to use entryKenny Root2010-07-132-1/+92
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Make HTTP Header class handle multiple cache-control fields."Romain Guy2010-07-151-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Make HTTP Header class handle multiple cache-control fields.Henrik Baard2010-07-141-1/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HTTP specification states the following about the fields: Multiple message-header fields with the same field-name MAY be present in a message if and only if the entire field-value for that header field is defined as a comma-separated list [i.e., #(values)]. It MUST be possible to combine the multiple header fields into one "field-name: field-value" pair, without changing the semantics of the message, by appending each subsequent field-value to the first, each separated by a comma. The order in which header fields with the same field-name are received is therefore significant to the interpretation of the combined field value, and thus a proxy MUST NOT change the order of these field values when a message is forwarded. Change-Id: I1a6fe5cc8f541f8e80d559641d270d09eac9d85c
* | | Start app with several activities with intent filter [Main, Launcher] was brokenJohan Erlandsson2010-07-131-2/+3
| | | | | | | | | | | | | | | | | | | | | When an application have more than one activities with intent filter [Main, Launcher], then the intent with ResolverActivity wasn't created correct. Change-Id: I2617122e07c35284862d2e0643888966ec0f7221
* | | Remove top panel in alert dialog if empty.Martin Sjolin2010-07-131-0/+1
|/ / | | | | | | | | | | | | | | 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
* | Merge "Reduced Warnings by adding Type Arguments and removing unused imports"Jean-Baptiste Queru2010-07-121-11/+11
|\ \
| * | Reduced Warnings by adding Type Arguments and removing unused importsChristian Mehlmauer2010-06-251-11/+11
| |/ | | | | | | Change-Id: I42f8f9f9a6a6b271eaeb1a02f6d6567a630936ea
* | Merge "Documentation Bug (Issue 9557)"Jean-Baptiste Queru2010-07-121-45/+45
|\ \
| * | Documentation Bug (Issue 9557)Christian Mehlmauer2010-07-061-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Improved logging when there's an error creating the directories in ↵Jean-Baptiste Queru2010-07-091-42/+39
|\ \ \ | |/ / |/| | | | | getFilesDir()"
| * | Improved logging when there's an error creating the directories in getFilesDir()Christian Mehlmauer2010-06-251-42/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am d19c397b: Merge "Do not log AT command traffic by default." into froyoNick Pelly2010-06-241-2/+2
|\ \ | |/ |/| | | | | | | | | Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp * commit 'd19c397b04f485e0af5990f3541e703934869290': Do not log AT command traffic by default.
| * Do not log AT command traffic by default.Nick Pelly2010-06-241-2/+2
| | | | | | | | | | Bug: 2792732 Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
* | am 30cf330f: Import revised translationsKenny Root2010-06-211-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp * commit '30cf330fae137587d51aa4c026459db146705ba9': Import revised translations
| * Import revised translationsKenny Root2010-06-211-2/+2
| | | | | | | | Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
* | am c4e38577: Import revised translationsKenny Root2010-06-215-166/+166
|\ \ | |/ | | | | | | | | | | Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp * commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17': Import revised translations
| * Import revised translationsKenny Root2010-06-205-166/+166
| | | | | | | | Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
* | merge from open-source masterThe Android Open Source Project2010-06-181-30/+53
|\ \ | | | | | | | | | Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
| * \ Merge "Fixing counting the number of days in call log screen."Jean-Baptiste Queru2010-06-151-30/+53
| |\ \
| | * | Fixing counting the number of days in call log screen.David Sobreira Marques2010-05-011-30/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Counting the number of days in call log screen when a call was made/received within a week is not correct. Issue 3132: Call Log Reporting Wrong Change-Id: I99c3cb40267b4b5938ccc4225993b7aac7e2d018 Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
* | | | merge from open-source masterThe Android Open Source Project2010-06-181-1/+11
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
| * | | Support custom themes with AlertDialog.BuilderMartin Nordholts2010-06-151-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a constructor to AlertDialog.Builder with a 'theme' parameter so that e.g. the buttons in a dialog built with AlertDialog.Builder can be themed. Change-Id: Ie1b1c9706ad2146c8b64dd91fe249c6855c6ac65
* | | | merge from open-source masterThe Android Open Source Project2010-06-181-1/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
| * | | Merge "fillWindow's start position must be smaller than getCount value"Romain Guy2010-06-151-1/+1
| |\ \ \
| | * | | fillWindow's start position must be smaller than getCount valueTatsuo Nagamatsu2010-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3664ae8f6172f02bf6e2472320e79e3bf8683cc0
* | | | | merge from open-source masterThe Android Open Source Project2010-06-152-77/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
| * | | | - updates NetUtils to use new libnetutils headersSzymon Jakubczak2010-06-152-77/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - updates WifiStateTracker to track net.XXX.dnsX properties for name servers - removes dhcp from WifiNative (use NetworkUtils instead) Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9
* | | | | am 322e7e47: Merge "docs: fix markup error" into froyoScott Main2010-06-151-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp * commit '322e7e477d89aca18d65cbd289343e716c45a699': docs: fix markup error
| * | | | docs: fix markup errorScott Main2010-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Icea017095f58068c55dd3c1c18cecbdf06afb595
* | | | | Fix buildThe Android Open Source Project2010-06-151-2781/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file was brought back to life by mistaken when merging from a branch where it was modified into a branch where it had been deleted Change-Id: I406c6ced978abfdd59684f14bc9dd53ee7968aae
* | | | | merge from open-source masterThe Android Open Source Project2010-06-153-2/+2783
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
| * | | | Replaced deprecated Inten.toURI methodChristian Mehlmauer2010-06-143-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
* | | | | merge from open-source masterThe Android Open Source Project2010-06-141-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
| * | | | Merge "replaced deprecated getIntent with parseURI"Jean-Baptiste Queru2010-06-141-2/+2
| |\ \ \ \
| | * | | | replaced deprecated getIntent with parseURIChristian Mehlmauer2010-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice9e74fd8f729d7efad934d2de4c747d73be562e
* | | | | | merge from open-source masterThe Android Open Source Project2010-06-141-2/+41
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
| * | | | | Merge "Added an addAll to the ArrayAdapter"Jean-Baptiste Queru2010-06-141-2/+41
| |\ \ \ \ \
| | * | | | | Added an addAll to the ArrayAdapterChristian Mehlmauer2010-06-121-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It behaves the same as ArrayList.addAll, since the Object containing the Objects in the Adapter is a List. Now you can add multiple Objects at once, instead of looping over a Collection and add all items one by one. Unittests will be submitted to the cts project Change-Id: I16f3286a8ca4cda7eb9f1a99c2aab1cc45b2550f
| * | | | | | Merge "Should accept "application/vnd.wap.multipart.alternative" message."Jean-Baptiste Queru2010-06-141-0/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | merge from open-source masterThe Android Open Source Project2010-06-141-0/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
| * | | | | | Should accept "application/vnd.wap.multipart.alternative" message.takuo2010-06-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, PduParser does not allow application/vnd.wap.multipart.alternative as M-RETRIEVE.CONF but some Mobile carrier send message with this type. This patch allows that and take the first part of multipart as message body. It fixes http://code.google.com/p/android/issues/detail?id=8957 Change-Id: Ic93259c91331d1e67100439114b7c4f43a834368
* | | | | | | merge from open-source masterIrfan Sheriff2010-06-111-0/+15
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
| * | | | | | Merge "WLAN: Reset power save mode to startup value after DHCP response."Jean-Baptiste Queru2010-06-111-0/+15
| |\ \ \ \ \ \
| | * | | | | | WLAN: Reset power save mode to startup value after DHCP response.Mikael Kanstrup2010-06-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the driver was configured to run with power save mode disabled the power save mode incorrectly got reverted back to AUTO mode right after DHCP response. The power save mode value is now saved so that the device properly reverts back to a previous mode after DHCP response. Change-Id: I5035aad10146812ecef1be8ea4b22a03e230ccc9
* | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-111-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
| * | | | | | | Add PageUp and PageDown hot keysChih-Wei Huang2010-06-101-0/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I588f70d74bc5c02e1fb60c7a2821d8801f2333e0
* | | | | | | am b00854d4: Import revised translationsKenny Root2010-06-094-10/+10
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into froyo-plus-aosp * commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e': Import revised translations
| * | | | | | Import revised translationsKenny Root2010-06-094-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
* | | | | | | merge from open-source masterThe Android Open Source Project2010-06-091-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
| * | | | | | Merge "Adding mimetypes to the mimetype map used in the web view"Jean-Baptiste Queru2010-06-091-0/+3
| |\ \ \ \ \ \
generated by cgit v1.1 at 2025-02-09 21:23:39 +0000