Winson Chung
4181e8a4ac
Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
2012-11-07 17:50:24 -08:00
Winson Chung
c065a5d727
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
...
- Laying out the drop target without padding from the multiuser picker
Change-Id: Icd3528a13f84a789341a841645bfde4e51fd1747
2012-11-07 17:44:42 -08:00
Adam Cohen
85c4281aae
Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
2012-11-07 17:08:31 -08:00
Jim Miller
5da893c93b
Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
2012-11-07 17:01:53 -08:00
Amith Yamasani
5ec00e930f
Don't cancel any notifications that are meant for all users, if no package is specified.
...
Bug: 7490028
Otherwise notifications such as the USB debugging and OTA notifications will be
dismissed when any user is stopped.
Change-Id: I0ae0c1136a999dd3aade99ca9e71c714b359eab4
2012-11-07 16:58:30 -08:00
Adam Cohen
d51700b3cc
Fixing up overscroll asset / sizing
...
-> No more jaggies! yay (issue 7459049)
-> Fixed up weird overscroll state (issue 7489094)
Change-Id: I5d6714a6f5f007ea0f73e4cf34a20572c5f43f64
2012-11-07 16:54:35 -08:00
Irfan Sheriff
1f6cf5fade
Merge "Re-use existing thread" into jb-mr1.1-dev
2012-11-07 16:43:26 -08:00
Svetoslav Ganov
cd1f309505
Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
2012-11-07 16:39:21 -08:00
Jim Miller
f6ab5f9e3e
Add one more check for detecting crashes while inflating multiuser widget
...
Fix bug 7437751
Change-Id: I2e1d94458db9e56e049dae32f088b13a21803217
2012-11-07 16:15:13 -08:00
Jim Miller
4096288022
Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
2012-11-07 16:05:46 -08:00
Jim Miller
edc74abf8a
Implement fallback clock in keyguard
...
This clock is shown if widgets are ever disabled by DPM and the
default clock package is not enabled.
Fixes bug 7469367
Change-Id: I8cf140c0fc00dd56265e3a332aff2fe3b41e3ec0
2012-11-07 15:58:47 -08:00
Svetoslav Ganov
7ce0c13c0e
Slide unlock cannot get accessibility focus.
...
1. There are two overlaid views, one is the GlowPadView and the
other is the SlidingChallengeLayout. Since the GlowPadView is
on top of the other view it has to consume the hover events or
they will be dispatched to the view behind it which results
the the GlowPadView not getting accessibility focus.
bug:7496770
Change-Id: Iae3b1777e490c56e33560a016fc04a92226bfb66
2012-11-07 15:55:02 -08:00
Michael Jurka
fd8c388f02
Merge "Fix bug where newly added widget wasn't always shown" into jb-mr1-lockscreen-dev
2012-11-07 15:02:08 -08:00
Adam Cohen
3e66286f7c
Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
2012-11-07 14:44:12 -08:00
Adam Cohen
f988bdfbae
Fixing up glowpad scaling issues (issue 7494378)
...
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
2012-11-07 14:43:33 -08:00
Michael Jurka
1413889565
Fix bug where newly added widget wasn't always shown
...
Bug: 7491900
Change-Id: I878eea745ee6127b757aa945631c1a4eb08d9936
2012-11-07 14:22:26 -08:00
Adam Powell
c717d110ae
Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
2012-11-07 14:14:24 -08:00
Sascha Prueter
de974f6f20
am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
...
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
Final icon for notifications panel
2012-11-07 14:12:40 -08:00
Sascha Prueter
eb3aa44c10
am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
...
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
Final icon for notifications panel
2012-11-07 14:12:33 -08:00
Sascha Prueter
972dd431f8
Merge "Final icon for notifications panel" into jb-mr1-dev
2012-11-07 14:08:22 -08:00
Adam Powell
eeb6255056
Fix keyguard measurement bugs
...
Bug 7493748
Bug 7493764
Change-Id: I2182ec4347eefc80198e675684bc5d195f947763
2012-11-07 14:07:46 -08:00
Victoria Lease
eb6cbc22b2
am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
...
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
disable geofences for secondary users
2012-11-07 14:01:41 -08:00
Victoria Lease
4abe2d3d36
am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
...
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
disable geofences for secondary users
2012-11-07 14:01:31 -08:00
Victoria Lease
ad84f7f46b
Merge "disable geofences for secondary users" into jb-mr1-dev
2012-11-07 13:56:46 -08:00
Chris Wren
8e3bf41d8b
Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
2012-11-07 13:49:03 -08:00
Chris Wren
d2dec00a0a
add logging to enableUserSelectorIfNecessary.
...
Bug: 7437751
Change-Id: I4a223ac68f780dac212ee5ed0729d59278fd1e4b
2012-11-07 16:38:33 -05:00
Daniel Sandler
1ce804397f
Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
...
It previously did some of the logic of dismiss() itself:
checking to see if the KG is secure, and if not, proceeding
to call keyguardDone() to actually hide everything. But now
that we have the "bouncer" authentication UI, the WM should
let the keyguard challenge the user to see if even a secure
keyguard should be dismissed. (Insecure keyguards should
behave exactly has they did before.)
Unless, of course, the KVM is in a "dismissable" state, in
which case it's safe to call keyguardDone() directly. (This
can happen if the user has *already* authenticated and we're
ending up in this codepath in response.)
Bug: 7458531
Change-Id: I9571acf19f9bcc16bba7a826f916da7be8ca9c33
2012-11-07 16:38:21 -05:00
The Android Automerger
02253f4893
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 13:05:55 -08:00
Irfan Sheriff
cd3d75f35d
Re-use existing thread
...
Bug: 7377541
Change-Id: I097f2288ebfc2b4a9782cbced19d9c36d0703acb
2012-11-07 13:02:08 -08:00
Chris Wren
b524f4b928
Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
2012-11-07 12:39:54 -08:00
Daniel Sandler
2d09880d03
am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit 'afc5210a811da3824d75e32d998370203aba1968':
Fix docs to refer to the correct class.
2012-11-07 12:37:28 -08:00
Daniel Sandler
7b5a92766a
am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit 'afc5210a811da3824d75e32d998370203aba1968':
Fix docs to refer to the correct class.
2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81
Merge "Fix docs to refer to the correct class." into jb-mr1-dev
2012-11-07 12:35:01 -08:00
Chris Wren
91f080c777
add some defensive code to enableUserSelectorIfNecessary.
...
Bug: 7437751
Change-Id: I3f8e317624f158fce0d58be69b733699a208d802
2012-11-07 15:21:37 -05:00
Baligh Uddin
62e2374baa
am 32226b73: (-s ours) Import translations. DO NOT MERGE
...
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
Import translations. DO NOT MERGE
2012-11-07 11:58:11 -08:00
Baligh Uddin
0d29833f96
am 32226b73: Import translations. DO NOT MERGE
...
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
Import translations. DO NOT MERGE
2012-11-07 11:57:36 -08:00
Baligh Uddin
32226b73ca
Import translations. DO NOT MERGE
...
Change-Id: I82793ad9ed66b4e2924b3c32a2292bad69b56579
Auto-generated-cl: translation import
2012-11-07 11:54:30 -08:00
Baligh Uddin
d44c4344aa
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-11-07 11:52:29 -08:00
Adam Cohen
8f837a690b
Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
2012-11-07 11:51:06 -08:00
Adam Cohen
4eb36cfdca
Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
...
Change-Id: I736816dac8cea47632fbdbc75b367f2c6216dff7
2012-11-07 11:45:30 -08:00
Baligh Uddin
db60b67533
am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
Import translations. DO NOT MERGE
2012-11-07 11:42:46 -08:00
Baligh Uddin
b97aadec0f
am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
Import translations. DO NOT MERGE
2012-11-07 11:42:04 -08:00
Baligh Uddin
fc958f12f6
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-07 11:39:41 -08:00
The Android Open Source Project
63985103f3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I290ad0de0601dc3c49366d7b9d44d9d30021559d
2012-11-07 11:36:42 -08:00
Baligh Uddin
2d6a1b778d
Import translations. DO NOT MERGE
...
Change-Id: Ia0befbcb0a476a7afffa3cd748625fa9f32e826f
Auto-generated-cl: translation import
2012-11-07 11:34:53 -08:00
John Spurlock
66453ff534
am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
...
* commit '506fd3b02ef4b036aceb66db76ca93c55254bfcf':
Low battery dialog should use UserHandle.CURRENT.
2012-11-07 11:34:47 -08:00
John Spurlock
506fd3b02e
Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
2012-11-07 11:31:30 -08:00
Romain Guy
fcd7ad4e28
am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774 " into jb-mr1-dev
...
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-07 11:18:55 -08:00
The Android Automerger
5246b8a8e2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 11:18:07 -08:00
Romain Guy
59d73ab6fc
Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774 " into jb-mr1-dev
2012-11-07 11:15:36 -08:00