summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2012-10-1632-64/+32
| | | | | Change-Id: I7c26f20a77ec622563c5dcdad7a96c347005a789 Auto-generated-cl: translation import
* Merge "Accessibility focus drawing does not take into account view's ↵Svetoslav Ganov2012-10-162-14/+8
|\ | | | | | | transformation matrix." into jb-mr1-dev
| * Accessibility focus drawing does not take into account view's transformation ↵Svetoslav Ganov2012-10-152-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix. 1. We are using the view drawing bounds but did not take into account the transformation matrix. This leads to showing ugly artifacts on the launcher's hotseat which is pretty much the first thing we see. 2. Updated the documentation of View.getDrawingRect to be more explicit that the results does not have the transformation matrix applied. bug:7354033 Change-Id: Ief2e0ea8da05471d71e215ce4497d94ff6e92d1a
* | Merge "Fix bugs in scriptGroup." into jb-mr1-devJason Sams2012-10-164-4/+4
|\ \
| * | Fix bugs in scriptGroup.Jason Sams2012-10-154-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intrinsics were treating inputs as fields rather than varObjs. This would generate a lot of extra work for the reflection layers. Also we would like to deprecate this path in the future. bug 7318821 Change-Id: I81e8c562ba05aae5d085d5c08e91e2c4877265c5
* | | Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-devJustin Ho2012-10-161-0/+47
|\ \ \
| * | | Add new tablet sound setJustin Ho2012-10-161-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7351672 Change-Id: I9228d3f87729862f94727f99a179538551449881
* | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1616-35/+19
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-1216-35/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie01452a6610e660cafc04e8d7fb509bed42de802 Auto-generated-cl: translation import
* | | | | Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 ↵Justin Ho2012-10-1619-0/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Bug: 7312457" into jb-mr1-dev
| * | | | | Update alarm sounds and tune some ringtonesJustin Ho2012-10-1619-0/+64
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7351672 Bug: 5502770 Bug: 7312457 Change-Id: Iea0d674431b0fabbf7e9c4b30d9f08a6235cdc64
* | | | | Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: ↵Justin Ho2012-10-1618-64/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 5502770 Bug: 7312457"" into jb-mr1-dev
| * | | | | Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: ↵Justin Ho2012-10-1618-64/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5502770 Bug: 7312457" This reverts commit 04fe8723e48644bf5e1afc098f2117cbec6ba68d Change-Id: I28ed23ad75ced96b66cc4dcce0faaf667c2d5d08
* | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1616-34/+18
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-1216-34/+18
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7741746c85ad546258953e5e7cf8d2acd899c27 Auto-generated-cl: translation import
* | | | | | Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 ↵Justin Ho2012-10-1618-0/+64
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Bug: 7312457" into jb-mr1-dev
| * | | | | Update alarm sounds and tune some ringtonesJustin Ho2012-10-1518-0/+64
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7351672 Bug: 5502770 Bug: 7312457 Change-Id: Icb89cdbadc0e06b4a845b1cad16560f66d5b2bdd
* | | | | Merge "Flipping quick settings!" into jb-mr1-devDaniel Sandler2012-10-1625-56/+360
|\ \ \ \ \
| * | | | | Flipping quick settings!Daniel Sandler2012-10-1625-56/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7348917 ╰(°□°╰) Change-Id: I16923d6d920913a4bd0d78666587ac579ac18da5
* | | | | | Merge "Allow any user to clear a notification targeted at USER_ALL." into ↵Daniel Sandler2012-10-152-10/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | Allow any user to clear a notification targeted at USER_ALL.Daniel Sandler2012-10-152-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds the userid to notification_* eventlogs. Bug: 7325802 Change-Id: I48055caf1344acd58b61607bf0be38cc299fc7be
* | | | | | | Merge "Always layout Keyguard on config change." into jb-mr1-devCraig Mautner2012-10-152-17/+18
|\ \ \ \ \ \ \
| * | | | | | | Always layout Keyguard on config change.Craig Mautner2012-10-152-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Keyguard to list of windows that can't be hidden by keyguard. Don't assign Configuration to window until layout has had a chance to compare it to window's existing Configuration. Bug: 7094175 Change-Id: I99a9fd4af9a31871fe130db7b6bdf49bd51a6092
* | | | | | | | Revert "Revert "Fix for bug 6050753.""Mathias Agopian2012-10-158-106/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emergency revert -- fix reboot loop. This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8. Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
* | | | | | | | Merge "Flag window animation transactions as animations." into jb-mr1-devJamie Gennis2012-10-153-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Flag window animation transactions as animations.Jamie Gennis2012-10-153-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes WindowManager use the new eAnimation flag when animating windows. This prevents some of the window updates from being combined with updates from prior animation frames. Bug: 7353840 Change-Id: I5a9f8fa2c1a2f5f08363a45cd9f28bb97cd77080
* | | | | | | | | Merge "Revert "Fix for bug 6050753."" into jb-mr1-devRomain Guy2012-10-158-74/+106
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Fix for bug 6050753."Romain Guy2012-10-158-74/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c29f031598811486d83f418fd08fbfe1fc41788a.
* | | | | | | | | | Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into ↵Romain Guy2012-10-152-0/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | Ensure we always request conformant OpenGL ES 2.0 contextsRomain Guy2012-10-152-0/+11
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b9d6f2dace02ad28baef6811007302b8e552a54
* | | | | | | | | | Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-devRomain Guy2012-10-153-0/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing layout_width/heightRomain Guy2012-10-153-0/+20
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7334849 Change-Id: Ie4bbe5905bec1d410b8b51e0194bb1c8c2b84680
* | | | | | | | | | Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-devJeff Brown2012-10-151-5/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Stop dreaming if the battery not charging effectively.Jeff Brown2012-10-151-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user activity timeout expired and the battery appears to be draining faster than it is charging then stop dreaming and go to sleep. Bug: 7312455 Change-Id: I1b9d89e5b2647c72c455d2792e3778a2fe6a4e34
* | | | | | | | | | | Merge "Cleanup some internal documentation." into jb-mr1-devJeff Brown2012-10-151-8/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Cleanup some internal documentation.Jeff Brown2012-10-151-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7312455 Change-Id: Idefd71f2e9d1abe1b2671dac9702edf7f5fbc118
* | | | | | | | | | | Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" ↵Jim Miller2012-10-152-16/+54
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | | | | Fix inoperative "Forgot pattern" button when face unlock enabledJim Miller2012-10-152-16/+54
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the forgot pattern button wasn't working because the logic for face unlock was interfering with determining the proper backup to use. The fix: - adds a new state to SecurityMode so we have an initial condition we can check for. - passes the current mode to SecurityModel.getBackupSecurityMode() so it relies on the current state. - prevents face unlock from invoking callbacks that change state once we're no longer showing face unlock. Fixes bug 7346989 Change-Id: I4e64515efbbad712f11c820e690b458f352bf46c
* | | | | | | | | | Merge "Support pm clear as --user." into jb-mr1-devJeff Sharkey2012-10-151-4/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support pm clear as --user.Jeff Sharkey2012-10-151-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7352703 Change-Id: I0e9cc4f2313e5424d234c3cb051004c0321d9dac
* | | | | | | | | | | Merge "Fix for bug 7344916 text view flickers when you hit enter" into ↵Raph Levien2012-10-151-2/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | Fix for bug 7344916 text view flickers when you hit enterRaph Levien2012-10-151-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flickering was caused by trying to scroll to the cursor position while the view was in an inconsistent state (text updated to change the number of lines, but layout not done yet). This patch defers the actual setting of the cursor until layout is done, when layout is pending. Change-Id: I8ed3a402beb8058ac7a7f3935afeb946a23308ab
* | | | | | | | | | | | Merge "Update wifi display device name when renamed." into jb-mr1-devJeff Brown2012-10-151-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Update wifi display device name when renamed.Jeff Brown2012-10-151-1/+12
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7340725 Change-Id: Ia3835a37fa3800371920f863b82f992efe764664
* | | | | | | | | | | Merge "Announce changes to the keyguard security message for accessibility." ↵Svetoslav Ganov2012-10-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | | | | | Announce changes to the keyguard security message for accessibility.alanv2012-10-151-0/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7352702 Change-Id: I790d7be08b222ae3cb76459064802f587c3e6f30
* | | | | | | | | | | Merge "Use device availability to start WFD audio routing" into jb-mr1-devJean-Michel Trivi2012-10-152-16/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use device availability to start WFD audio routingJean-Michel Trivi2012-10-112-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use the force_use mechanism to start WFD audio routing, but rather only the availability of the remote submix audio device. This is matched by a change in the audio policy manager. Bug 7318180 Change-Id: I756f032d8ca0375c3dbeddb7c321261c497539bc
* | | | | | | | | | | | Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-devChris Craik2012-10-153-47/+300
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | HW Acceleration support for stroked arcs with BUTT capsChris Craik2012-10-153-47/+300
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4419017 Change-Id: I7371bfb36cef460da861a47d4d945218c6d0c3d0