summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rewind buffer before copying into it.Marco Nelissen2012-10-121-0/+1
| | | | | | b/7334897 Change-Id: I83f795cb662d0845314bfb80b9a27ae45b2a0517
* Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1249-49/+97
|\
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-1149-49/+97
| | | | | | | | | | Change-Id: I4ef6935d25a8428069225adb3648701e93fd9c17 Auto-generated-cl: translation import
* | Merge "Revert "Always show emergency button on selector view screen in ↵Patrick Brady2012-10-111-3/+1
|\ \ | | | | | | | | | keyguard." I'm reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I'll handle re-adding it if needed." into jb-mr1-dev
| * | Revert "Always show emergency button on selector view screen in keyguard." ↵Patrick Brady2012-10-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | I'm reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I'll handle re-adding it if needed. This reverts commit 43c5b5568539dd1726fff75f7bee7eb481f87844 Change-Id: I2289658d3afaea9d1655b1811f49435de6c130e1
* | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-114-5/+5
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-114-5/+5
| | |/ | |/| | | | | | | | | | Change-Id: I7f9b815759c2f9f2e2d41811df14dfc8f9370da8 Auto-generated-cl: translation import
* | | Merge "New alarm ringtones" into jb-mr1-devIsaac Katzenelson2012-10-1111-0/+70
|\ \ \
| * | | New alarm ringtonesIsaac Katzenelson2012-10-1111-0/+70
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7299078 Adding 2 new sound files, replacing 3 more. Added a new makefile with the 2 new files. Change-Id: I417dd6cfe8ae575fcb2cefbe4fd7f59b762c708b
* | | Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into ↵Christopher Tate2012-10-111-4/+4
|\ \ \ | | | | | | | | | | | | jb-mr1-dev
| * | | DOCUMENTATION ONLY: try to clarify gravity vs layout_gravityChristopher Tate2012-10-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on 3rd party developer observation, this is a source of much confusion and layout mistakes. Change-Id: I2cb6ae1540fe2444582403d9100478ebe02df985
* | | | Merge "Center text selection point to avoid rounding glitches" into jb-mr1-devJohn Reck2012-10-111-13/+28
|\ \ \ \
| * | | | Center text selection point to avoid rounding glitchesJohn Reck2012-10-111-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7313424 Change-Id: I5356bec61e3d1244b506486300f059aa0bba6d9e
* | | | | Merge "Always show emergency button on selector view screen in keyguard." ↵Jim Miller2012-10-111-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | into jb-mr1-dev
| * | | | Always show emergency button on selector view screen in keyguard.Jim Miller2012-10-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7276760 Change-Id: I685aadc3535defa5e83fb514a3c333b48526312e
* | | | | am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications GuideJoe Malin2012-10-1118-605/+861
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '54a1e4d4c4216af987c7b769723cd2e59ca2c233': DOC CHANGE: Notifications Guide
| * \ \ \ \ am 5832d1ce: am 01154bda: DOC CHANGE: Notifications GuideJoe Malin2012-10-1118-605/+861
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5832d1ce7240c056a1e85a49549635b60711a5c6': DOC CHANGE: Notifications Guide
| | * \ \ \ \ am 01154bda: DOC CHANGE: Notifications GuideJoe Malin2012-10-1118-605/+861
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01154bdae9d6f3d1fbed3169ffa194d51045c9cf': DOC CHANGE: Notifications Guide
| | | * | | | | DOC CHANGE: Notifications GuideJoe Malin2012-10-1118-605/+861
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7968e933b0fdc5b1de1aa24acbad4f65f183ca42
* | | | | | | | Merge "Update compatibility library tests" into jb-mr1-devStephen Hines2012-10-1135-293/+1391
|\ \ \ \ \ \ \ \
| * | | | | | | | Update compatibility library testsJason Sams2012-10-1035-293/+1391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 7327728 Change-Id: If3f85fb8944d7217a4d5c035f522d1ecc7af3a07
* | | | | | | | | Merge "Print newly generated userId." into jb-mr1-devJeff Sharkey2012-10-111-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Print newly generated userId.Jeff Sharkey2012-10-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7334718 Change-Id: Id4dc456b079bebbe9f2d7ea2a8343d2215f296dc
* | | | | | | | | | Merge "Return ApplicationInfo with requested userId." into jb-mr1-devJeff Sharkey2012-10-111-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Return ApplicationInfo with requested userId.Jeff Sharkey2012-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return ApplicationInfo with requested userId instead of trying to infer it from calling UID. Bug: 7334712 Change-Id: I9ce0061e2d020b0d74c7c9cd22d89c5ff2466a6c
* | | | | | | | | | Merge "Do not launch Somnambulator as a dock app." into jb-mr1-devJeff Brown2012-10-113-89/+152
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not launch Somnambulator as a dock app.Jeff Brown2012-10-113-89/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a black flash that occurred when the device was docked because the UiModeManagerService was launching the Somnambulator to start the dream when docked. This caused an unnecessary activity transition and could in fact make dreaming less reliable than if the UiModeManagerService started the dream itself. Moved common code from UiModeManagerService and Somnambulator to Sandman to ensure it is kept in sync. Bug: 7328545 Change-Id: I46102784e2ab1acc0241d43a48abf0581278af24
* | | | | | | | | | | Merge "Check whether ChromeVox is ready before attempting to call it." into ↵Svetoslav Ganov2012-10-111-3/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | Check whether ChromeVox is ready before attempting to call it.alanv2012-10-111-3/+26
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to performAction will immediately return false if ChromeVox is not loaded. Also adds additional debugging output. Bug: 7328657 Change-Id: I5bd7c69ccc9500cebaa4a8c1bf023794f4eebe2e
* | | | | | | | | | | Merge "This is wrong since it fixed the symptom not the problem. Alan is ↵Svetoslav Ganov2012-10-111-12/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | uploading a correct patch." into jb-mr1-dev
| * | | | | | | | | | This is wrong since it fixed the symptom not the problem. Alan is uploading ↵Svetoslav Ganov2012-10-111-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a correct patch. Revert "Reducing WebView navigation timeout for accessibility." This reverts commit 2203cf3f725220e6dc930ee77dbcde4ff7d885b6 Change-Id: I5b2d999851af98acb953529ebfcda608ce27799d
* | | | | | | | | | | Merge "Reducing WebView navigation timeout for accessibility." into jb-mr1-devclchen2012-10-111-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Reducing WebView navigation timeout for accessibility.clchen2012-10-111-1/+12
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reducing the amount of time that WebView will wait before treating a navigation attempt as failed. This is needed to recover from cases where the user is attempting to linearly navigate a WebView that is immediately switched out right as it starts to read. A good example of this problem is AdMob's WebViews which are continuously being swapped. Change-Id: Ib9b4a9b99a35d42920e34e0acbe8ab45e1d47871
* | | | | | | | | | Merge "Fix off-by-one." into jb-mr1-devJeff Brown2012-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix off-by-one.Jeff Brown2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7330567 Change-Id: I8653435c77daefa24991595f68b9f23dd930f14a
* | | | | | | | | | | Merge "Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217" ↵Romain Guy2012-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | | | | | Don't scale bitmaps to an empty size when targetDpi=0Romain Guy2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7334217 Change-Id: I8d232a835580ffbf85334e0a3580e8d8240c8570
* | | | | | | | | | | | Merge "Unhide setPictureListener" into jb-mr1-devJonathan Dixon2012-10-113-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Unhide setPictureListenerJonathan Dixon2012-10-113-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The replacement isn't available yet, so we need to leave this in for now. BUG: 7332831 Change-Id: I311c44c45ef71461572afbe4060d134cdaefd3ae
* | | | | | | | | | | | Merge "Letting partial update fall through if the widget has not received a ↵Winson Chung2012-10-112-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full update yet. (Bug 7214731)" into jb-mr1-dev
| * | | | | | | | | | | | Letting partial update fall through if the widget has not received a full ↵Winson Chung2012-10-112-2/+13
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update yet. (Bug 7214731) Change-Id: I4da99c259df51f8f66d3ade1156040bd0360ca5d
* | | | | | | | | | | | Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into ↵Jeff Brown2012-10-112-16/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | | Ensure MediaRouter correctly handles renamed Wifi displays.Jeff Brown2012-10-112-16/+35
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a couple of bugs that cause MediaRouter to disconnect from the current Wifi display whenever it is renamed. Added an extra check in WifiDisplayAdapter for identity renames. The Settings app already handles this case but it's good to have the service check for it as well so we don't store unnecessary aliases. Bug: 7310777 Change-Id: I8fddd32ca59f9b798ee31b467b81457508c345f8
* | | | | | | | | | | | Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into ↵Jeff Brown2012-10-111-129/+146
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | Ensure Binder in-calls to UiModeManagerService are guarded.Jeff Brown2012-10-111-129/+146
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a couple of problems where locks were not being taken or where the calling identity was being clear deep in the call stack whereas it should be cleared as close to the entry point possible to ensure code correctness. Bug: 7328545 Change-Id: I8ff646a772cd7f4025d5604bc35c6372c3d2428e
* | | | | | | | | | | Merge "Check for apps closing and restore mExiting test." into jb-mr1-devCraig Mautner2012-10-112-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check for apps closing and restore mExiting test.Craig Mautner2012-10-112-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removal of the mExiting test in a previous CL was a mistake leading to z-order errors. In particular the auto complete dialog was on top of the IME and was being dismissed due to touches on the IME. Restoring mExiting alone missed cases where apps were exiting which don't set mExiting. Adding a test for membership in mClosingApps fixes that. Bug: 7327220 fixed. Change-Id: I3965b8a07080d1347bdada51ffeafe6ef2e32c8e
* | | | | | | | | | | | Merge "Copy date format style from keyguard." into jb-mr1-devChris Wren2012-10-113-23/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Copy date format style from keyguard.Chris Wren2012-10-113-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7312660 Change-Id: Ia5e728758bd1f2caa039ea6b8f8fa9abcc9f8417
* | | | | | | | | | | | | am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android ↵Joe Fernandez2012-10-111-11/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform 4.1.2 (16, r3)" into jb-dev-docs * commit '07d2ad883b43a80469ec881421d544ff3b75c50a': docs: Release Notes: Android Platform 4.1.2 (16, r3)