summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove empty finalize methods."Carl Shapiro2010-02-243-15/+0
|\
| * Remove empty finalize methods.Carl Shapiro2010-02-243-15/+0
| |
* | Merge "MountService: Send UMS_CONNECTED broadcast on boot if UMS connected."San Mehat2010-02-241-9/+19
|\ \
| * | MountService: Send UMS_CONNECTED broadcast on boot if UMS connected.San Mehat2010-02-241-9/+19
| | | | | | | | | | | | | | | | | | | | | UMS detection is now done wayyyy before the system is booted, so set a flag to send our intent broadcast once we've booted. Signed-off-by: San Mehat <san@google.com>
* | | am cbe4f887: (-s ours) am a406fb90: DO NOT MERGEGrace Kloba2010-02-240-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243' * commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243': DO NOT MERGE
| * \ \ am a406fb90: DO NOT MERGEGrace Kloba2010-02-241-10/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a406fb90805adf36fe0fabd3a79018e33706453c' into eclair-mr2-plus-aosp * commit 'a406fb90805adf36fe0fabd3a79018e33706453c': DO NOT MERGE
| | * | | DO NOT MERGEGrace Kloba2010-02-241-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If mPreventDrag is cancelled due to time out, remove the pending TOUCH_EVENTS and then send an ACTION_CANCEL and skip the rest of touch events. This should address the drag problem Flash plugin has. Fix http://b/issue?id=245053
* | | | | Merge "Fix tabs."Romain Guy2010-02-241-15/+11
|\ \ \ \ \
| * | | | | Fix tabs.Romain Guy2010-02-241-15/+11
| | | | | |
* | | | | | Merge "ScrollView multiple pointer support. Fixed a bug where ScrollView ↵Adam Powell2010-02-241-15/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | wouldn't scroll if the initially tapped child ignores the down event."
| * | | | | | ScrollView multiple pointer support. Fixed a bug where ScrollViewAdam Powell2010-02-241-15/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | wouldn't scroll if the initially tapped child ignores the down event.
* | | | | | | Merge "Introducing tentative (and hidden) API for contact search snippets"Dmitri Plotnikov2010-02-241-0/+50
|\ \ \ \ \ \ \
| * | | | | | | Introducing tentative (and hidden) API for contact search snippetsDmitri Plotnikov2010-02-241-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2447965 Change-Id: I0608ca7a644f004613742f4680a5a9fd3325554a
* | | | | | | | Merge "Tethering improvements."Robert Greenwalt2010-02-242-185/+122
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Tethering improvements.Robert Greenwalt2010-02-242-185/+122
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes due to comments. Fixing Tether teardown. bug:2422545
* | | | | | | Merge "AsecTests: Add teardown to tests"San Mehat2010-02-241-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | AsecTests: Add teardown to testsSan Mehat2010-02-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | | | | | Merge "Fix the build."Romain Guy2010-02-242-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix the build.Romain Guy2010-02-242-0/+7
| | | | | | | |
* | | | | | | | Merge "New update of preloaded classes for Froyo."Jesse Wilson2010-02-245-563/+730
|\ \ \ \ \ \ \ \
| * | | | | | | | New update of preloaded classes for Froyo.Jesse Wilson2010-02-245-563/+730
| | | | | | | | |
* | | | | | | | | Merge "Add 'restoreAnyVersion' attr for apps that want to restore "future" data"Chris Tate2010-02-246-13/+70
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add 'restoreAnyVersion' attr for apps that want to restore "future" dataChristopher Tate2010-02-246-13/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a backup-participating app sets android:restoreAnyVersion="true" in its manifest <application> tag, then its agent will be invoked for restore even if the available dataset was created by a later version of the app than is currently installed on the device. This will not typically be a problem for third party applications, since for them the installation and initial data restore are tightly coupled, but it can cause serious problems for applications which are both preinstalled on the system partition and overridden by later updates. The primary difficulty that this new attribute addresses is this: 1. User buys a Nexus One, Market self-updates, and the user installs some apps. At this point the backup data on the server may indicate that the version of Market which originated its bookkeeping is newer than the stock N1 Market app. 2. User loses their phone, and buys a replacement N1. At setup time, Market has not yet had a chance to self-update, so when the restore comes in, it's tagged as being from "the future" and so the restore is refused. No apps get reinstalled. Bug: 2442127 Change-Id: I076a9553dc613e5c3189350e778315718ed1ed2b
* | | | | | | | | Prevents ListView items children to modify properties of other children.Romain Guy2010-02-245-16/+77
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #2464502 This fix introduce a new dispatch mechanism to tell views when they are temporary detached/reattached from/to a ListView. This is very important to remove pending callbacks or cleanup temporary states. This change also modifies TextView which was relying on that callback in a very particular case: a focused EditText in a ListView. The modified code acts only when in that case, not if onStart/FinishTemporaryDetach() is called via dispatch*() (== recycled views in ListView.)
* | | | | | | | Merge "Make ScrollView only do overscroll if you're grabbing the child view."Joe Onorato2010-02-241-21/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make ScrollView only do overscroll if you're grabbing the child view.Joe Onorato2010-02-241-21/+49
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "allow permission USE_CREDENTIALS for ↵Fred Quintana2010-02-242-11/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | AccountManager.invalidateAuthToken as well as the previous MANAGE_ACCOUNTS"
| * | | | | | | allow permission USE_CREDENTIALS for AccountManager.invalidateAuthToken as ↵Fred Quintana2010-02-242-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well as the previous MANAGE_ACCOUNTS
* | | | | | | | Merge "Filenames of sound effects are not translatable."Eric Fischer2010-02-241-7/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Filenames of sound effects are not translatable.Eric Fischer2010-02-241-7/+7
| | | | | | | |
* | | | | | | | Merge "yet another race condition fix to address bug:2456970"Vasu Nori2010-02-241-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | yet another race condition fix to address bug:2456970Vasu Nori2010-02-241-1/+3
| | | | | | | | |
* | | | | | | | | Merge "If mPreventDrag is cancelled due to time out, remove the pending ↵Grace Kloba2010-02-241-10/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TOUCH_EVENTS and then send an ACTION_CANCEL and skip the rest of touch events."
| * | | | | | | | | If mPreventDrag is cancelled due to time out, removeGrace Kloba2010-02-241-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the pending TOUCH_EVENTS and then send an ACTION_CANCEL and skip the rest of touch events. This should address the drag problem Flash plugin has. Fix http://b/issue?id=245053
* | | | | | | | | | Merge "Recover from a certain mp3 decoder error instead of signalling an ↵Andreas Huber2010-02-241-6/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | error and thereby stopping decoding."
| * | | | | | | | | Recover from a certain mp3 decoder error instead of signalling an error and ↵Andreas Huber2010-02-241-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thereby stopping decoding.
* | | | | | | | | | Merge "Fix spelling mistakes in attrs_manifest.xml"Kenny Root2010-02-241-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix spelling mistakes in attrs_manifest.xmlKenny Root2010-02-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ff54cacff85ff60535b2c03559a33d219c52e72
* | | | | | | | | | | Merge "b/2441327 Added add account intent to public api."Erik Pasternak2010-02-242-2/+60
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | b/2441327 Added add account intent to public api.Erik2010-02-242-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ACTION_ADD_ACCOUNT intent and EXTRAS_AUTHORITIES strings to the public api so that Calendar can send users to the add account screen directly instead of via the sync settings page.
* | | | | | | | | | | Merge "Add some backup Javadoc and clean imports"Kenny Root2010-02-2413-102/+170
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add some backup Javadoc and clean importsKenny Root2010-02-2413-102/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a bit more Javadoc to the backup infrastructure and clean up unused imports. Change-Id: I8ab7c3fb887ae2e8d2f1bfac42f03cb4b42685ef
* | | | | | | | | | | | Merge "- return the accounts when getAccountByTypeAndFeatures is passed a ↵Fred Quintana2010-02-241-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null or empty features set, http://b/issue?id=2467165 - clear the authtokens when the password changes"
| * | | | | | | | | | | | - return the accounts when getAccountByTypeAndFeatures isFred Quintana2010-02-241-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passed a null or empty features set, http://b/issue?id=2467165 - clear the authtokens when the password changes
* | | | | | | | | | | | | Fix crash in PendingIntentRecord debug output.Dianne Hackborn2010-02-244-20/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add null checks to a few places to avoid crashes when dumping debug data. Also add some sanity checks for accessing content providers in the activity manager.
* | | | | | | | | | | | | Merge "Focus the IME on WebView when no textfield is in focus."Leon Scroggins2010-02-241-13/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Focus the IME on WebView when no textfield is in focus.Leon Scroggins2010-02-231-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix a particular case where the navigation cache does not recognize that a textfield is now in focus. A message was sent from the WebCore thread telling us to open the IME on the textfield. Open it with the WebView as the served view. Fix for http://b/issue?id=2457459
* | | | | | | | | | | | | Merge "GpsLocationProvider: Be less aggressive about getting fixes in bad ↵Mike Lockwood2010-02-241-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditions if we have a long fix interval."
| * | | | | | | | | | | | | GpsLocationProvider: Be less aggressive about getting fixes in bad ↵Mike Lockwood2010-02-241-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditions if we have a long fix interval. Change-Id: I68bd884409ca15e584ab70e53cf142d60f318d9c BUG: 2215714 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | | Merge "Fix broken location extras in GpsLocationProvider."Mike Lockwood2010-02-241-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /