summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of bad927 to masterRomain Guy2009-06-082-22/+11
|\
| * Merge change 3480 into donutAndroid (Google) Code Review2009-06-082-194/+185
| |\ | | | | | | | | | | | | * changes: Do not automatically enable gestures in list based on filtering/fastscroll status. Enable gestures in Contacts for now.
| | * Do not automatically enable gestures in list based on filtering/fastscroll ↵Romain Guy2009-06-082-194/+185
| | | | | | | | | | | | status. Enable gestures in Contacts for now.
* | | Merge change 3485Android (Google) Code Review2009-06-083-76/+60
|\ \ \ | | | | | | | | | | | | | | | | * changes: Fix build issue and ref count bug with scripts.
| * | | Fix build issue and ref count bug with scripts.Jason Sams2009-06-083-76/+60
| | | |
* | | | resolved conflicts for merge of 410ea6 to masterKen Shirriff2009-06-081-5/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Merge change 3471 into donutAndroid (Google) Code Review2009-06-081-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Fix contact creation.
| | * | | Fix contact creation.Ken Shirriff2009-06-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This was broken by my change 2934. bug=1903820
* | | | | am 996b1c8d: Merge change 3431 into donutAndroid (Google) Code Review2009-06-082-4/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '996b1c8d681268961a9e6518b9a5cbe98ccf0111' * commit '996b1c8d681268961a9e6518b9a5cbe98ccf0111': Moved error status from SpeechServiceRecognizerListener
| * | | | Merge change 3431 into donutAndroid (Google) Code Review2009-06-082-4/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Moved error status from SpeechServiceRecognizerListener
| | * | | | Moved error status from SpeechServiceRecognizerListenerMitsuru Oshima2009-06-082-4/+13
| | | | | |
* | | | | | am bdf90a08: Merge change 3462 into donutAndroid (Google) Code Review2009-06-081-0/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3' * commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3': Capture the memory output before the playback and record start.
| * | | | | Merge change 3462 into donutAndroid (Google) Code Review2009-06-081-0/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * changes: Capture the memory output before the playback and record start.
| | * | | | Capture the memory output before the playback and record start.Yu Shan Emily Lau2009-06-081-0/+7
| | | |_|/ | | |/| |
* | | | | am fa5c7e1d: Catch when a file resource (non values) added in an overlay.Robert Greenwalt2009-06-081-14/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b' * commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b': Catch when a file resource (non values) added in an overlay.
| * | | | Catch when a file resource (non values) added in an overlay.Robert Greenwalt2009-06-081-14/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | File resources are assigned resource id's and if an overlay adds one it renumbers things and breaks compatability. Used to segfault if you tried before, but now catches it and lets you know what file caused the problem.
* | | | send click in browser when key is sent to unfocused text fieldCary Clark2009-06-082-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, set focusControllerActive state based on presence of focus and cursor that wants key events. Disable focusControllerActive when moved cursor wants key events. Remove unused recompute-focus code.
* | | | Update the language from "focus".Leon Scroggins2009-06-082-95/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, many methods, variables, etc referred to the focus. Now, they have been changed to refer to the cursor when appropriate. Some references were changed to the focusCandidate, since they may apply to either the focus or the cursor, which is a candidate for focus. Also removed unneeded method unblockFocus. WebView will not work without a corresponding change in external/webkit.
* | | | am 1e3d1b4b: Merge change 3107 into donutAndroid (Google) Code Review2009-06-0720-392/+1097
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7' * commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7': Motorola changes from 090602 through 090605
| * | | Merge change 3107 into donutAndroid (Google) Code Review2009-06-0720-392/+1097
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Motorola changes from 090602 through 090605
| | * | | Motorola changes from 090602 through 090605Wink Saville2009-06-0720-392/+1097
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes from 090602 update frameworks/base to support 3way calling and call waiting. The changes from 090603 completed the CdmaInformationRecords class but the original changes submitted has been simplified, toString added and a bug fixed where the notifications where not being handled properly. The changes from 090605 added Prl Version, apn fixes.
* | | | | am 58c24412: Merge change 3422 into donutAndroid (Google) Code Review2009-06-071-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '58c244125fc2d2067bf89e67a154f6ca2421fe36' * commit '58c244125fc2d2067bf89e67a154f6ca2421fe36': Check AirplaneMode when enabling Bluetooth has finished.
| * | | | Merge change 3422 into donutAndroid (Google) Code Review2009-06-071-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Check AirplaneMode when enabling Bluetooth has finished.
| | * | | | Check AirplaneMode when enabling Bluetooth has finished.Daisuke Miyakawa2009-06-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of manual merge from cupcake_dcm to donut. Should be reviewed by mchan and takaoka. Original internal CL: 149471-p9
* | | | | | am 9d9953d9: Merge change 3420 into donutAndroid (Google) Code Review2009-06-071-3/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d9953d94de4d17722ba2c768b92bd4ebeec908c' * commit '9d9953d94de4d17722ba2c768b92bd4ebeec908c': LocationManagerService: Remove some unneeded imports.
| * | | | | Merge change 3420 into donutAndroid (Google) Code Review2009-06-071-3/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: LocationManagerService: Remove some unneeded imports.
| | * | | | | LocationManagerService: Remove some unneeded imports.Mike Lockwood2009-06-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 8c850b79: Add IRestoreSession interface for the restore flowChristopher Tate2009-06-077-29/+96
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8c850b792f2d371fd8a4aff146d9d757ee982539' * commit '8c850b792f2d371fd8a4aff146d9d757ee982539': Add IRestoreSession interface for the restore flow
| * | | | | | Add IRestoreSession interface for the restore flowChristopher Tate2009-06-077-29/+96
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore is a fairly complicated, somewhat stateful process, so we introduce a new interface to encapsulate the various bits and pieces into a nicely separable component. In particular, this will make it much cleaner to open and interrogate an expensive-to-construct transport and then reuse it for the actual restore process itself.
* | | | | | am b4a6188a: Add rough-draft restore API set to IBackupTransportChristopher Tate2009-06-073-2/+78
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b4a6188a74273611abcae05f3a3b1f0547548301' * commit 'b4a6188a74273611abcae05f3a3b1f0547548301': Add rough-draft restore API set to IBackupTransport
| * | | | | Add rough-draft restore API set to IBackupTransportChristopher Tate2009-06-073-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * getAvailableBackups returns the list of backup sets available for restore * getAppSet() returns the set of apps available from a given backup set * getRestoreData() streams the full backup data for a given application (within a given backup set) into a FD; that data will be handed to the app's backup agent for processing.
* | | | | | am da55569b: Merge change 3417 into donutAndroid (Google) Code Review2009-06-074-16/+26
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'da55569b0aaf98ff4d472d85ae1b038e76e1e9c3' * commit 'da55569b0aaf98ff4d472d85ae1b038e76e1e9c3': Adjust IBackupTransport interface
| * | | | | Merge change 3417 into donutAndroid (Google) Code Review2009-06-074-16/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Adjust IBackupTransport interface
| | * | | | | Adjust IBackupTransport interfaceChristopher Tate2009-06-074-16/+26
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of just passing a package name to performBackup, pass the whole PackageInfo struct, explicitly including the list of signatures for the package. No need to make each transport look this up individually when it's a necessary part of the backup payload for each app.
* | | | | | am 7757656a: Changed logic to handle timeout pages.Guang Zhu2009-06-071-2/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7757656a11ba7050274c337fd2dc2f18f9e7806f' * commit '7757656a11ba7050274c337fd2dc2f18f9e7806f': Changed logic to handle timeout pages.
| * | | | | Changed logic to handle timeout pages.Guang Zhu2009-06-071-2/+5
| |/ / / /
* | | | | am 19cd309f: Merge change 3017 into donutAndroid (Google) Code Review2009-06-052-6/+179
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3' * commit '19cd309f9eccdf8454dc6e5076013588b7a170a3': Add the EAP related fields for WiFi configuration.
| * | | | Merge change 3017 into donutAndroid (Google) Code Review2009-06-052-6/+179
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add the EAP related fields for WiFi configuration.
| | * | | | Add the EAP related fields for WiFi configuration.Chung-yih Wang2009-06-052-6/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- added the EAP/802.1X related fields in WifiConfiguration for supporting EAP/802.1X authentication. -- hid the related fields for now.
* | | | | | am 6fa95976: Apply OOM adjustment while an app is undergoing backupChristopher Tate2009-06-051-3/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6fa959769051f08655292ec47aa8480b248b67fd' * commit '6fa959769051f08655292ec47aa8480b248b67fd': Apply OOM adjustment while an app is undergoing backup
| * | | | | Apply OOM adjustment while an app is undergoing backupChristopher Tate2009-06-051-3/+28
| | | | | |
* | | | | | am 1aa8170e: Add per-named-item overlay ability in res xml.Robert Greenwalt2009-06-052-5/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707' * commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707': Add per-named-item overlay ability in res xml.
| * | | | | Add per-named-item overlay ability in res xml.Robert Greenwalt2009-06-052-5/+17
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes 1899451. Also errors out if you add a bag via an overlay (which would renumber resources). Note that you can still add elements within the bag as they are not issued resource IDs. So for example you can now modify the framework themes.xml file without copying the entire file. All bag types are now modifable except non-named bag types (how would you address which element to replace?): array string_array integer_array
* | | | | am 5d16ac5e: Merge change 3374 into donutAndroid (Google) Code Review2009-06-051-1/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5d16ac5eb6c4a468cabc39bdd00eac1759993db5' * commit '5d16ac5eb6c4a468cabc39bdd00eac1759993db5': Fix tracking of backup participants across package remove/update
| * | | | Merge change 3374 into donutAndroid (Google) Code Review2009-06-051-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix tracking of backup participants across package remove/update
| | * | | | Fix tracking of backup participants across package remove/updateChristopher Tate2009-06-051-1/+8
| | | | | |
* | | | | | am e3523054: Merge change 3356 into donutAndroid (Google) Code Review2009-06-051-44/+73
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e3523054ded8c6e86935a978aa136c3ed2c0ba12' * commit 'e3523054ded8c6e86935a978aa136c3ed2c0ba12': Cleaning up comments in interface for TTS engines.
| * | | | | Merge change 3356 into donutAndroid (Google) Code Review2009-06-051-44/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Cleaning up comments in interface for TTS engines.
| | * | | | | Cleaning up comments in interface for TTS engines.Jean-Michel Trivi2009-06-051-44/+73
| | | | | | |
* | | | | | | am 4e0b13c9: Merge change 3348 into donutAndroid (Google) Code Review2009-06-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4e0b13c9a94f2085d44d0fe36fd16e2599477145' * commit '4e0b13c9a94f2085d44d0fe36fd16e2599477145': Fix AlphabetIndexer.getSectionForPosition()
generated by cgit v1.1 at 2024-07-08 08:36:26 +0000