summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Inform ContentObservers about the changed content Uri."Jeff Brown2012-01-236-18/+105
|\
| * Inform ContentObservers about the changed content Uri.Jeff Brown2012-01-236-18/+105
| | | | | | | | | | | | | | | | Added a new method ContentObserver.onChange(boolean, Uri) that receives the changed content Uri. This can help applications make better decisions about how to interpret a change notification. Change-Id: I8e35378b6485fe22c5bc240ba07557d269af0836
* | Merge "Clean up content observer code."Jeff Brown2012-01-236-95/+126
|\ \ | |/
| * Clean up content observer code.Jeff Brown2012-01-236-95/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved the documentation a little bit. Fixed a bug in ContentService wherein if a ContentObserver was passed as an argument and its deliverSelfNotifications() method returned true, then notifyChange would tell all observers that the change was a self-change even though it was only a self-change from the perspective of the provided observer. Deprecated ContentObservable.notifyChange since it is never used and in general it shouldn't be because we want the notification to be posted to the handler. Change-Id: Idde49eb40777e011a068f2adae8a32f779dfb923
* | Merge "Add full support for Canvas.setDrawFilter()"Romain Guy2012-01-232-0/+30
|\ \
| * | Add full support for Canvas.setDrawFilter()Romain Guy2012-01-232-0/+30
| | | | | | | | | | | | Change-Id: I0ad35d0603c4eeda469014803be14c1dcdde918c
* | | Merge "Fix bug #5846413 "phone" keyboard layout is broken on master"Fabrice Di Meglio2012-01-234-18/+41
|\ \ \
| * | | Fix bug #5846413 "phone" keyboard layout is broken on masterFabrice Di Meglio2012-01-234-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - was a subtle regression introduced when fixing bug #5753006 - as we are now using SkPaint::kGlyphID_TextEncoding (glyph encoding) instead of SkPaint::kUTF16_TextEncoding (UTF16 encoding), we need to force the UTF16 encoding in some cases that are NOT going thru the TextLayoutCache / Harfbuzz shaping - fix also breakText() the same way - also clean some old comment - Warning: depends also on a CL from Skia for having getBaseGlyphCount() "const" Change-Id: I3d1fc87f070884876c679b33541f810fbfb5df3f
* | | | Merge "Fix API typo"Romain Guy2012-01-231-1/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Fix API typoRomain Guy2012-01-231-1/+18
| | | | | | | | | | | | | | | | Change-Id: Iac6de947b0d550cc8dd4a3b5d88baa322c21bbb8
* | | | Merge "Fix crash when scrolling a layer"John Reck2012-01-231-0/+1
|\ \ \ \
| * | | | Fix crash when scrolling a layerJohn Reck2012-01-231-0/+1
| |/ / / | | | | | | | | | | | | Change-Id: I6e61f3b38c5d1291ceb36c9dfa87fcd78480c2f4
* | | | Merge "New screen rotation animation design."Dianne Hackborn2012-01-2310-21/+290
|\ \ \ \
| * | | | New screen rotation animation design.Dianne Hackborn2012-01-2310-21/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have an animation that can start as soon as we detect to rotate the screen, and have a different phase once the new UI is ready to complete the transition into it. Change-Id: I05b9c12a699232acbddc36b4a994a4452db71476
* | | | | Merge "Double tap to select enabled on suggestions"Gilles Debunne2012-01-231-2/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Double tap to select enabled on suggestionsGilles Debunne2012-01-201-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a runnable to schedule the action, interrupted by any other touch event, enabling a catch of a double tap to trigger text selection instead. Change-Id: I21f8b9fdfad0036d6970f5dbfe6d72dd3eff35a1
* | | | | Merge "New brightness setting to adjust auto-brightness mode."Dianne Hackborn2012-01-232-0/+8
|\ \ \ \ \
| * | | | | New brightness setting to adjust auto-brightness mode.Dianne Hackborn2012-01-232-0/+8
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Icfec22be99d8c79e9ff5720b80fb9dacbba36134
* | | | | Don't use bootstrap loader directlyAndy McFadden2012-01-231-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VM is allowed to use null to represent the bootstrap class loader, so attempting to call methods on it is a bad idea. Use the system class loader instead. Change-Id: I9190848945f679d546d5fb30aba10fd27c7e5404
* | | | Merge "Use Map.Entry, not HashMap.Entry"Andy McFadden2012-01-231-1/+2
|\ \ \ \
| * | | | Use Map.Entry, not HashMap.EntryAndy McFadden2012-01-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map.Entry is the defined return value from entrySet(). HashMap.Entry shouldn't be used directly. Change-Id: Ia21598c6a73fe7eb22179ce114095f779c903084
* | | | | Merge "Add cut and paste to ContentEditable."George Mount2012-01-234-11/+188
|\ \ \ \ \
| * | | | | Add cut and paste to ContentEditable.George Mount2012-01-184-11/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5806267 Use visual selection to determine the webkit selection. The webkit selection can be used to cut text from an editable area. It can also be used to do better complex character text copy. Webkit change: I194c6d9e2add67151b97092a1a54f5c081296000 Change-Id: I56543d17670a8c98484314c89c7fa6a94cb809e4
* | | | | | Merge "Remove fastInvalidate and setFast* methods"Michael Jurka2012-01-231-109/+0
|\ \ \ \ \ \
| * | | | | | Remove fastInvalidate and setFast* methodsMichael Jurka2012-01-201-109/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - were only being used by Launcher, and they've been removed from there too Change-Id: I230e79c89a6450756220ad5cc07180bb5b725bd6
* | | | | | | Merge "Delete dead code."Jeff Brown2012-01-201-17/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Delete dead code.Jeff Brown2012-01-201-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API has never been used or exposed, time for it to go away. Change-Id: Ie199ed0731d0a620d6608b2adbea1083f87276cd
* | | | | | | am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen ↵Jim Miller2012-01-202-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | immediately." into ics-mr1 * commit 'ab9601cdbb95ae94088750eff9a926a572c1a4d6': Fix 5863053: Add method to lock screen immediately.
| * \ \ \ \ \ \ am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." ↵Jim Miller2012-01-182-0/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '230a709285abc5dfd92f05d91a8997d52a59d3c7': Fix 5863053: Add method to lock screen immediately.
| | * \ \ \ \ \ \ Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1Jim Miller2012-01-182-0/+10
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix 5863053: Add method to lock screen immediately.Jim Miller2012-01-172-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the device fails to lock when DevicePolicyManagerService requests the device to be locked and the screen was off because the user hit the power button. The change allows DPMS to directly invoke screen lock, bypasssing the screen state. Change-Id: Iecdda6fc61e9c519119de495be23c69c3b983921
* | | | | | | | | | Use audio_format_t consistently, continuedGlenn Kasten2012-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was int or uint32_t. When AudioFlinger::format can't determine the correct format, return INVALID rather than DEFAULT. Init mFormat to INVALID rather than DEFAULT in the constructor. Subclass constructors will set mFormat to the correct value. Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
* | | | | | | | | | Merge "Log netd traffic nicely."Robert Greenwalt2012-01-201-0/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Log netd traffic nicely.Robert Greenwalt2012-01-201-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a LocalLog class for logging within a service for dumping in dumps. Use it in the NativeDaemonConnector so we can get some insight into what is happening in these lockups. bug:5864209 Change-Id: I68ddc58847f3c8de613be9528570f8c3157d8274
* | | | | | | | | | | Merge "Initialize SQLite as part of the android runtime."Jeff Brown2012-01-206-58/+83
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Initialize SQLite as part of the android runtime.Jeff Brown2012-01-206-58/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the SQLite library is always correctly configured and initialized before other framework or application code has a chance to use it. This is important because initialization has to happen at most once so we need to get it right and prevent races. This change makes it possible to omit the SQLite auto-initialization workaround from the SQLite library, potentially saving a few cycles here and there. Change-Id: Ifbed8685ee44aa1e9c0b391e233b0257fa738e4f
* | | | | | | | | | Merge "Touch moves cursor in text refactored"Gilles Debunne2012-01-202-16/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Touch moves cursor in text refactoredGilles Debunne2012-01-192-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was moved back from the movement method to the touch event code in TextView. Change-Id: I7dc0d957554ddce08e810d20e0385f98802ef1a4
* | | | | | | | | | Merge "Fix typos in string constants"Glenn Kasten2012-01-201-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typos in string constantsGlenn Kasten2012-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were copy/paste errors in code that was copied from AudioTrack. Change-Id: I64a04d6026667884ddb1fefba67a71d69c691d62
* | | | | | | | | | | Merge "AOOB in AutoComplete"Gilles Debunne2012-01-201-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AOOB in AutoCompleteGilles Debunne2012-01-181-2/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5749557 Not clear how we can get an AOOB in that case. tmp will always have the right length, and indeed the stack trace attached to that bug shows a correct size of 10. However, there is an index issue when we build the new completion array. i is not the correct index to use. Note however that the original buildDropDown method mentioned is no longer present in the file. I tried to backtrack, but the use of arraycopy always seemed correct. Change-Id: Idf749c74b38923b5d18596c8e8f6ea887cc897d6
* | | | | | | | | | | Merge "Make sure text selection always starts"Gilles Debunne2012-01-201-5/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make sure text selection always startsGilles Debunne2012-01-191-5/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When text can indeed be selected, we should always initiate a text selection on long press. When the WordIterator fails (for instance if the text is entirely made of punctuation characters, maybe also with foreign languages), we select one character. Change-Id: I842507f7cbaed9a924d3176ea8ed6586f3548366
* | | | | | | | | | | Merge "Remove dead setRingerMode(mode, mask)"Glenn Kasten2012-01-201-7/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove dead setRingerMode(mode, mask)Glenn Kasten2012-01-181-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
* | | | | | | | | | | | Merge "Fixes some javadoc."Pin Ting2012-01-201-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixes some javadoc.Pin Ting2012-01-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ad1f1452e2c8e004865853247e0b34b78bb1616
* | | | | | | | | | | | Merge "Clean up SQLiteDebug natives."Jeff Brown2012-01-192-47/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clean up SQLiteDebug natives.Jeff Brown2012-01-192-47/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, ensure that the database is initialized. Change-Id: Ifa69a9dfa9d008af79beadbd1a25e90d0d29e66c