1489 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
164ff6bb64 Merge into jb-mr1-dev
Change-Id: I65f9c552cf0ef2792df64c907f0a56913e6c6f30
2012-09-25 09:42:30 -07:00
Jim Miller
7641506e3c Fix wrong password attempt count in DevicePolicyManager
Keyguard wasn't resetting dpm's count when a successful password
was made.  The result is the device would get wiped earlier than
it should.

Also fixes a TODO left over from keyguard refactoring that
allowed face unlock to trigger the same logic (ouch!).

Fixes bug 7219258

Change-Id: I2bd13c50a9beb8225d3237e86d5e34b73d0eb3cf
2012-09-24 19:31:29 -07:00
Kenny Root
c6f8a9985b Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev 2012-09-24 08:43:34 -07:00
Jim Miller
1cd5522fcc Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev 2012-09-21 20:07:46 -07:00
Jim Miller
3fd47af32d Send USER_PRESENT for keyguard choice "None"
This enables sending ACTION_USER_PRESENT when the user has
selected "None" for their keyguard screen. When this happens,
we delegate sending the event to onScreenTurnedOn().

Tested:
- None -> sends broadcast in onSystemReady() the first time after boot
and in onScreenTurnedOn() there after.
- Slide -> sends broadcast only once when screen is dismissed
- Pattern -> sends broadcast only once when screen is dismissed

Fixes bug 7029707

Change-Id: I785c3255b15e2ee598a10d7d3580ba5c03dd0068
2012-09-21 20:06:50 -07:00
Amith Yamasani
77e95d3d71 Merge "Show lockscreen widgets for the current user." into jb-mr1-dev 2012-09-21 18:16:49 -07:00
Amith Yamasani
8fd96ec2dc Show lockscreen widgets for the current user.
Also shows the owner info and next alarm for the current user.
AppWidgetService now assumes that any widgets running in the system process are for the
current user, so that lockscreen shows widgets for the current user

Bug: 7211754
Bug: 7212421

Change-Id: Iaf0edc60e49af0afe42625c0b2dcf100c9ecc178
2012-09-21 18:10:34 -07:00
Kenny Root
abb53b72fb LockScreen: don't update KeyStore password on unlock
The Gingerbread migration case updated the password when the user
unlocked their device. This is probably not needed anymore and disturbs
multi-user, so just remove it.

Bug: 7169463
Change-Id: Ie62eb9f3fee6953b1123cb7ef3665d519632c6f7
2012-09-21 16:15:33 -07:00
Jim Miller
1ed9fa10de Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev 2012-09-21 15:21:33 -07:00
Michael Jurka
7566abd305 Merge "Add support for changing status widget on security screen" into jb-mr1-dev 2012-09-21 01:10:53 -07:00
Amith Yamasani
920ace0bbc Query users excluding any being removed
Keep track of user creation and last logged-in time.
adb shell dumpsys users
User switcher shouldn't show users about to be removed.
No need to check for singleton for activities.

Bug: 7194894
Change-Id: Ic9a59ea5bd544920479e191d1a1e8a77f8b6ddcf
2012-09-20 22:33:43 -07:00
Michael Jurka
20c41d5382 Add support for changing status widget on security screen
Change-Id: I080fd89eb84445604c602b6e807b55153a7ee129
2012-09-20 19:19:41 -07:00
Jim Miller
48b9b0d068 Make DPM API for disabling keyguard widgets more generic
This change renames the widget-specific API to be more generic
to allow further disabling of keyguard-specific customizations
in the future.  Currently only allows disabling widgets and the
secure camera but can now easily be extended to disable other
features we add.

Fixes bug: 7021368

Change-Id: I3934cc2e7c64e0c6d511efb86980fc38a849708d
2012-09-19 23:44:45 -07:00
Jim Miller
109f1fd80c Update keyguard selector view to match UX design spec
- Use new Roboto-Thin font
- Add new keyguard-specific date format
- Layout tweaks to keyguard selector screen.
- Add smart EmergencyButton class
- Add selective upper-casing of components on the display to enable later UX decision
- Work around SIM state bug

Bug: 7094419
Change-Id: Ic7e0f30697c14d4946372509d98ad81bf6a23c92
2012-09-19 20:47:37 -07:00
Dianne Hackborn
52716deb40 Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 2012-09-19 13:28:11 -07:00
Craig Mautner
f1b6741975 Fix deadlock in LockPatternUtils by using local id.
Activity manager now updates window manager's current user id
directly and immediately rather than waiting for a broadcast
update. Window manager passes this through policy to the
KeyguardViewMediator and into LockPatternUtils. LockPatternUtils
no longer goes to Activity to get the current user id if it finds
that its local id is non-default.

Fixes bug 7193726.

Change-Id: Id5613e7a9fe9e5b49e83c26b74504f587c3998c2
2012-09-19 13:18:29 -07:00
Craig Mautner
8f301e6668 Merge "Add debug for b/7094175." into jb-mr1-dev 2012-09-19 13:07:53 -07:00
Jim Miller
5d8d169bbb Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev 2012-09-18 21:06:41 -07:00
Jim Miller
d2b82f70fe Fix wrong pattern count in keyguard pattern security view.
This fixes a bug introduced in I085c5ec8 where keyguard attempts to emulate
slippery windows with views.  In order to do so,  the code was overloading
dispatchTouchEvent().  It would allow the super (a ViewGroup) to dispatch
the events and then would dispatch them itself to sub views.  In the case
where an event overlaps an actual child view, it would  result in 2 copies of the event
per window layer (there are 2).  This results in 2 events per layer for the
top two views in the hierarchy. So each actual pattern attempt would count as 4
attempts to the system.

The solution is to overload onTouchEvent() at each level in the view hierarchy,
which means that we ignore events that were already handled by a child window
of the parent.

This change also disables slippery windows for keyguard because it causes
vertical patterns to be ignored.

Fixes bug 7191277

Change-Id: I4df217f2bf382134d93113b8d55b0d71e0e23677
2012-09-18 21:02:08 -07:00
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Adam Powell
98c370e71d Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 2012-09-18 18:42:59 -07:00
Adam Powell
4b6d93fd04 Make invalidateOptionsMenu asynchronous
Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.

Bug 7189372

Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8
2012-09-18 18:37:28 -07:00
Jim Miller
402f0c8123 Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 2012-09-18 17:00:38 -07:00
Jim Miller
772db427a7 Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev 2012-09-18 15:32:04 -07:00
Amith Yamasani
599dd7ce9a DevicePolicyManager per user
Bug: 7136483

Store device policy information for each user and apply them when user switches.

Global proxy can only be controlled by owner.
Camera restriction applies to all users, if any one has an admin that disables it.
Storage encryption can only be controlled by owner, although other users can query the state.
Wipe data will only remove the user if non-zero, wipe the device, if zero.

Change-Id: I359be46c1bc3828fd13d4be3228f11495081c8f2
2012-09-18 14:28:33 -07:00
Craig Mautner
0cbfcffe7b Add debug for b/7094175.
Change-Id: Iec83b9350bfeb804dfe3da25986138c2dbaa6d45
2012-09-18 10:19:49 -07:00
Jim Miller
f9cb7ba158 Refactor Carrier text as a movable module.
We seem to move carrier text around a lot. Rather than moving the support code,
this creates a smart text field that updates itself.

Change-Id: I9b5b7b22813e944f673a50e952742a1ac38c0e08
2012-09-17 22:31:56 -07:00
Jim Miller
931be0ee0c Merge "Don't show empty widget in the case where a widget can't be inflated" into jb-mr1-dev 2012-09-17 22:30:27 -07:00
Jim Miller
99a3cae55b Don't show empty widget in the case where a widget can't be inflated
If the use deletes the widget by disabling a package or removing it,
we used to show a placeholder widget.  Now it skips the widget if it's
not available.

Change-Id: I8582139bf982e41f3f16b5c002e248c5717290aa
2012-09-17 20:53:51 -07:00
Adam Cohen
5b50a25e6d Enabling hardware layers while overscrolling widget pager
Change-Id: I94bef1aa614f91b115105adbb409def8027f3651
2012-09-17 14:11:14 -07:00
Jim Miller
e23ab8b1ac Selectively enable back button in keyguard for security screens.
This enables the back button on secure keyguard screens so the user can
get back to the initial screen.

Partial fix for bug 7094419

Change-Id: I4dc0ac8facfd2930ccb60710c36015ec1d2c8aa6
2012-09-16 15:50:37 -07:00
Adam Cohen
6253985988 Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev 2012-09-16 14:46:55 -07:00
Adam Cohen
24b351ab74 Second pass on Keyguard multi-user switcher
-> animating active user to inactive, fading out lock
   selector, freezing screen, then switching users
-> for now, just using a fade, but this will likely
   see iteration

Change-Id: I3acc0b53f2cbf132741e3e0529e2e53fa2824542
2012-09-16 14:46:02 -07:00
Jim Miller
b45965f519 Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev 2012-09-16 11:57:23 -07:00
Dianne Hackborn
d65afc65ea Merge "More multi-user stuff." into jb-mr1-dev 2012-09-16 00:05:46 -07:00
Dianne Hackborn
5dc5a00e7e More multi-user stuff.
- New public APIs to find out when a user goes to the foreground,
  background, and is first initializing.
- New activity manager callback to be involved in the user switch
  process, allowing other services to let it know when it is safe
  to stop freezing the screen.
- Wallpaper service now implements this to handle its user switch,
  telling the activity manager when it is done.  (Currently this is
  only handling the old wallpaper going away, we need a little more
  work to correctly wait for the new wallpaper to get added.)
- Lock screen now implements the callback to do its user switch.  It
  also now locks itself when this happens, instead of relying on
  some other entity making sure it is locked.
- Pre-boot broadcasts now go to all users.
- WallpaperManager now has an API to find out if a named wallpaper is
  in use by any users.

Change-Id: I27877aef1d82126c0a1428c3d1861619ee5f8653
2012-09-15 23:58:55 -07:00
Jim Miller
08b2b6bfe2 Fix keyguard timeout dialog messages
This fixes an issue where the attempt count was incorrect.  We now show the
dialog *after* reporting the failed attempt.

This also fixes an issue where the text wasn't being reset in the password dialog
of keyguard.

Fixes bugs 7170545 and 7120895

Change-Id: Iba2009705373758acca6e10bd670eb34744bece9
2012-09-14 19:15:45 -07:00
Amith Yamasani
a87826c345 Merge "Fix face unlock for multiple users" into jb-mr1-dev 2012-09-14 14:11:58 -07:00
Amith Yamasani
4b4b954ddf Fix face unlock for multiple users
Bug: 7152537

Not all instances of LockPatternUtils are getting updated with the current user, so
query it directly from the Activity Manager.

Change-Id: I46395c3e00feecd0edfe4228f8d7966f425519f2
2012-09-14 13:36:29 -07:00
Jim Miller
f229e4d3eb Add support for settings for lock widgets
Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4
2012-09-14 12:31:24 -07:00
Jim Miller
6fba0a0c72 Music in keyguard improvements
- fix overscroll issue with workaround described in bug 7137941
- ignore noisy signals from music player that sometimes hide it

Change-Id: I6a25674ce7157bd70409f56881ec62644f5fce9b
2012-09-12 16:38:56 -07:00
Jim Miller
4f77268c8a Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev 2012-09-12 16:16:21 -07:00
Jim Miller
ff2aa0bc89 Initial pass at adding Music control to new keyguard.
- View is now added or removed based on AudioManager status
- Reduced depth of hierarchy by making KeyguardTransportControl a KeyguardWidgetFrame
- Return to the status view when we return to keyguard (onScreenTurnedOn)

Change-Id: Id7f9310ce4e7daf663471117564e5670f61b1471
2012-09-11 16:21:29 -07:00
Amith Yamasani
9c673b0536 Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev 2012-09-11 16:12:16 -07:00
Amith Yamasani
d979dd7fbc Go back to keyguard if user is switched in lock screen
This is not the preferred solution, but at least it is not incorrect.

Bug: 7144478
Change-Id: Iec26723b21ff5c64546d57f9d8744a3bf2929862
2012-09-11 15:53:37 -07:00
Jim Miller
752ef4e0f8 Merge "This enables the back button in keyguard" into jb-mr1-dev 2012-09-11 13:58:40 -07:00
Jim Miller
d03a555835 Attempt to fix blank keyguard issue
This is an attempt to fix bug 7137389. It forces a layout when the screen
comes back on, which should alleviate the issue.

Change-Id: I00a3829f1662a8db99d947856ca11660b4bfb805
2012-09-10 20:46:36 -07:00
Jim Miller
eeabf94226 Merge "Allow pattern to start from outside pattern view" into jb-mr1-dev 2012-09-10 18:13:57 -07:00
Amith Yamasani
5bf7800de6 Merge "Force keyguard if there are multiple users" into jb-mr1-dev 2012-09-10 18:12:42 -07:00
Amith Yamasani
b70ff9a181 Force keyguard if there are multiple users
Otherwise there would be no way to switch users if a user chooses None as lock screen.

Also adjust some layout params for Preference items to align the icons and text.

Change-Id: Ib11bb961edaef90de280bc7137d10b68765aea98
2012-09-10 18:11:46 -07:00