Jeff Brown
322de60657
Merge "Cleanup some internal documentation." into jb-mr1-dev
2012-10-15 18:40:05 -07:00
Jim Miller
bb2a020181
am 33987528: Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev
...
* commit '339875283263dbbe3587388f94f603439e59af5f':
Fix inoperative "Forgot pattern" button when face unlock enabled
2012-10-15 18:39:19 -07:00
Jim Miller
3398752832
Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev
2012-10-15 18:37:00 -07:00
Jeff Sharkey
77ce60a593
am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev
...
* commit '7789c9bbfca079655e9285173d6175b94bc774b0':
Support pm clear as --user.
2012-10-15 18:29:51 -07:00
Raph Levien
b9e224ccb5
am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
...
* commit '6f8c1bad8a7891f50eda2d3d14f774e28b8f8107':
Fix for bug 7344916 text view flickers when you hit enter
2012-10-15 18:25:13 -07:00
Jeff Sharkey
7789c9bbfc
Merge "Support pm clear as --user." into jb-mr1-dev
2012-10-15 18:24:34 -07:00
Raph Levien
6f8c1bad8a
Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
2012-10-15 18:19:50 -07:00
Jim Miller
63f9b81795
Fix inoperative "Forgot pattern" button when face unlock enabled
...
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
2012-10-15 18:16:24 -07:00
Romain Guy
8efca54693
Ensure we always request conformant OpenGL ES 2.0 contexts
...
Change-Id: I6b9d6f2dace02ad28baef6811007302b8e552a54
2012-10-15 18:09:49 -07:00
Justin Ho
04fe8723e4
Update alarm sounds and tune some ringtones
...
Bug: 7351672
Bug: 5502770
Bug: 7312457
Change-Id: Icb89cdbadc0e06b4a845b1cad16560f66d5b2bdd
2012-10-15 17:40:57 -07:00
Jeff Brown
4eaba60fff
am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev
...
* commit 'df409231a75c8b2ae976af66c0baec99b280aa33':
Update wifi display device name when renamed.
2012-10-15 17:23:39 -07:00
Raph Levien
f5c1a8798f
Fix for bug 7344916 text view flickers when you hit enter
...
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
2012-10-15 17:22:26 -07:00
Jeff Brown
df409231a7
Merge "Update wifi display device name when renamed." into jb-mr1-dev
2012-10-15 17:21:20 -07:00
Svetoslav Ganov
4a533efae3
am 25160a6f: Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev
...
* commit '25160a6f35b2cf487be2b8cea8b87b750f0c1c97':
Announce changes to the keyguard security message for accessibility.
2012-10-15 17:17:50 -07:00
Svetoslav Ganov
25160a6f35
Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev
2012-10-15 17:15:44 -07:00
Amith Yamasani
756901d82b
Do cleanup when Stopping users
...
Mark user 0 as initialized, otherwise it will show up as
uninitialized when viewed from secondary user if never switched to user 0.
Bug: 7301595
Also clean up any users that were in the process of being removed, if device
crashes at a bad time.
Change-Id: Ic16a6c9ccb6a64b7463725f6cc279335a821fcd5
2012-10-15 16:57:26 -07:00
Jeff Brown
016ff14f12
Stop dreaming if the battery not charging effectively.
...
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
2012-10-15 16:56:20 -07:00
Romain Guy
42b0c70a31
Add missing layout_width/height
...
Bug #7334849
Change-Id: Ie4bbe5905bec1d410b8b51e0194bb1c8c2b84680
2012-10-15 16:47:16 -07:00
Jean-Michel Trivi
6bf846160c
am 256ab9e9: Merge "Use device availability to start WFD audio routing" into jb-mr1-dev
...
* commit '256ab9e9b9ccf4ea23e1fcd6e4a9029a8004747f':
Use device availability to start WFD audio routing
2012-10-15 16:28:00 -07:00
Jean-Michel Trivi
256ab9e9b9
Merge "Use device availability to start WFD audio routing" into jb-mr1-dev
2012-10-15 16:24:56 -07:00
Jeff Sharkey
a3e9ff7deb
Support pm clear as --user.
...
Bug: 7352703
Change-Id: I0e9cc4f2313e5424d234c3cb051004c0321d9dac
2012-10-15 16:16:39 -07:00
Chris Craik
779ba3ad84
am 2aa50b6b: Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-dev
...
* commit '2aa50b6b0fd5791504a6b6881cbe8bfc6ea70e30':
HW Acceleration support for stroked arcs with BUTT caps
2012-10-15 16:11:23 -07:00
Chris Craik
2aa50b6b0f
Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-dev
2012-10-15 16:08:19 -07:00
Jeff Brown
ab887a09ad
Cleanup some internal documentation.
...
Bug: 7312455
Change-Id: Idefd71f2e9d1abe1b2671dac9702edf7f5fbc118
2012-10-15 16:01:37 -07:00
Victoria Lease
aca6527ed6
am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev
...
* commit '3f840c8c3c1c53f046f6d187b2d3c4120b8d8afe':
fix crashing apps
2012-10-15 15:52:53 -07:00
Jason Sams
e6a7886674
Fix bugs in scriptGroup.
...
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
2012-10-15 15:52:22 -07:00
Victoria Lease
3f840c8c3c
Merge "fix crashing apps" into jb-mr1-dev
2012-10-15 15:50:00 -07:00
alanv
f6d1afd141
Announce changes to the keyguard security message for accessibility.
...
Bug: 7352702
Change-Id: I790d7be08b222ae3cb76459064802f587c3e6f30
2012-10-15 15:37:44 -07:00
Jeff Brown
ee4f029ff4
Update wifi display device name when renamed.
...
Bug: 7340725
Change-Id: Ia3835a37fa3800371920f863b82f992efe764664
2012-10-15 15:31:59 -07:00
Victoria Lease
da479c5f8c
fix crashing apps
...
Bug: 7349330
Change-Id: Iea61bce23cb197c7a28d574098253823df73a99b
2012-10-15 15:24:16 -07:00
Xavier Ducrohet
136bd7c6ae
am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev
...
* commit '477687c1eb1919c54e2bffba2a740df3b4af6668':
Fix SDK layout rendering in Eclipse.
2012-10-15 15:17:46 -07:00
Xavier Ducrohet
477687c1eb
Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev
2012-10-15 15:15:14 -07:00
Xavier Ducrohet
6dfd0b39a6
Fix SDK layout rendering in Eclipse.
...
Change-Id: I0e9e85632012c0929b987ee9d0ccf7c25eece322
2012-10-15 15:14:44 -07:00
Adam Cohen
15ed1ba7c3
am 11dea4d7: Merge "Fix issue where pin field doesn\'t have focus (issue 7348937)" into jb-mr1-dev
...
* commit '11dea4d710138c27b2430f171aee48bb2b9e7381':
Fix issue where pin field doesn't have focus (issue 7348937)
2012-10-15 14:44:20 -07:00
Adam Cohen
11dea4d710
Merge "Fix issue where pin field doesn't have focus (issue 7348937)" into jb-mr1-dev
2012-10-15 14:41:26 -07:00
Romain Guy
807e4375e9
am f2e28abb: Merge "Update javadoc" into jb-mr1-dev
...
* commit 'f2e28abb1375c5ca513eac9dcde5c349f771de0f':
Update javadoc
2012-10-15 14:22:20 -07:00
Romain Guy
f2e28abb13
Merge "Update javadoc" into jb-mr1-dev
2012-10-15 14:19:29 -07:00
Adam Cohen
ac8a59d3d3
Fix issue where pin field doesn't have focus (issue 7348937)
...
Change-Id: Ia926765271251248701416c001e2e73131cdf4ad
2012-10-15 14:12:55 -07:00
Jeff Sharkey
ec8d1280ac
am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev
...
* commit '532c9c4543135463ee1f39b282d3156a3e226d50':
Protect more service dump() methods.
2012-10-15 14:03:53 -07:00
Jeff Sharkey
532c9c4543
Merge "Protect more service dump() methods." into jb-mr1-dev
2012-10-15 14:01:57 -07:00
Chris Craik
780c12875c
HW Acceleration support for stroked arcs with BUTT caps
...
bug:4419017
Change-Id: I7371bfb36cef460da861a47d4d945218c6d0c3d0
2012-10-15 13:49:58 -07:00
Craig Mautner
a3f4bf531f
Always layout Keyguard on config change.
...
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
2012-10-15 13:45:17 -07:00
Romain Guy
8e63bcc63f
Revert "Fix for bug 6050753."
...
This reverts commit c29f031598811486d83f418fd08fbfe1fc41788a.
2012-10-15 13:24:58 -07:00
Romain Guy
edc9005289
Update javadoc
...
Some View.post*() methods can be invoked from arbitrary thread
independently of whether the View is attached to a window.
Change-Id: I587b5909ab8b06665978d001548d56c8c22043c1
2012-10-15 12:31:57 -07:00
Daniel Sandler
321e9c562b
Allow any user to clear a notification targeted at USER_ALL.
...
This also adds the userid to notification_* eventlogs.
Bug: 7325802
Change-Id: I48055caf1344acd58b61607bf0be38cc299fc7be
2012-10-15 14:38:39 -04:00
Robert Greenwalt
4e579b5ac2
am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev
...
* commit 'a30d969401a8533a5a341664421ba9b1e150bac3':
Monitor the right interface re VPN
2012-10-15 11:37:13 -07:00
Robert Greenwalt
a30d969401
Merge "Monitor the right interface re VPN" into jb-mr1-dev
2012-10-15 11:34:13 -07:00
Jeff Sharkey
52801aae89
Protect more service dump() methods.
...
Bug: 6406965
Change-Id: Ia45a580c1e6f403308e7e540f18f2c0505af0f29
2012-10-15 10:59:51 -07:00
Irfan Sheriff
7e08477ed1
am d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev
...
* commit 'd86a532c5271dfbfe7378ddeb6700fafd92ecbcc':
Fix handling of lost device
2012-10-15 10:25:23 -07:00
Irfan Sheriff
d86a532c52
Merge "Fix handling of lost device" into jb-mr1-dev
2012-10-15 10:23:23 -07:00