1336 Commits

Author SHA1 Message Date
Jeff Brown
00ee17718a Merge "Don't allow shortcuts while keyguard showing." into jb-dev 2012-05-16 16:25:21 -07:00
Jim Miller
12e0c5ac1b Fix 6504124: Disable assist when ACTION_ASSIST is not available
Change-Id: I2218afa7954961309d8cf2f2be0aff10826b9243
2012-05-16 16:24:32 -07:00
Michael Jurka
fa1009638d Revert "Add shortcut for voice search"
This reverts commit 7a3489552ca92776c5e2a57c80026216b44005eb.

Change-Id: Iddfa86183ff0d189e8dbb5dc535344e064e0d103
2012-05-16 16:24:22 -07:00
Jeff Brown
602ab325ca Don't allow shortcuts while keyguard showing.
Bug: 6483916
Change-Id: Ica7d6b1dc6a844650e6f3a2399ebb6aab20e780e
2012-05-16 13:39:46 -07:00
JP Abgrall
32884bd822 am 44f41f28: Merge "Revert "unlock screen: enable DEBUG and track pattern start/cell progress."" into jb-dev
* commit '44f41f28eaeee4097644ab9bfce5f969977b0428':
  Revert "unlock screen: enable DEBUG and track pattern start/cell progress."
2012-05-16 13:26:39 -07:00
JP Abgrall
3421c02956 Revert "unlock screen: enable DEBUG and track pattern start/cell progress."
This reverts commit e94d763f69bdc80d1ec1d7c3dd258c4e10206a5b.

Get rid of the debugging for the release.
2012-05-16 10:44:10 -07:00
Adam Powell
60d9dfcb7e am 5ff7efa2: Merge "Appease the simians" into jb-dev
* commit '5ff7efa253486b2b482031ab9a3714fc5cc10f7f':
  Appease the simians
2012-05-15 14:56:21 -07:00
Adam Powell
5ff7efa253 Merge "Appease the simians" into jb-dev 2012-05-15 14:54:00 -07:00
Adam Powell
a60314c707 Appease the simians
Ensure that the shown panel view is not currently attached to a parent
before adding it to the panel decor view.

Bug 6430928

Change-Id: Ic64ec4222db4754e64afdf06d7d2b77fb5ef825a
2012-05-15 14:33:13 -07:00
Jeff Sharkey
6e547abdf0 am df7adb3a: Merge "Enable haptic feedback from ILockSettings." into jb-dev
* commit 'df7adb3a44f89578064975fa98324f0e9d84bdf3':
  Enable haptic feedback from ILockSettings.
2012-05-15 13:18:38 -07:00
Jeff Sharkey
df7adb3a44 Merge "Enable haptic feedback from ILockSettings." into jb-dev 2012-05-15 13:16:45 -07:00
Jeff Sharkey
3fb0af38a1 Enable haptic feedback from ILockSettings.
Bug: 6438580
Change-Id: I671ef3c7ac816596ab1944609bae672d1b0cb0ef
2012-05-15 12:37:51 -07:00
Danielle Millett
2a9e2d21e7 am 05dde913: Merge "Setting liveliness to off" into jb-dev
* commit '05dde913f97b29751572ed8169f6ba20374c7036':
  Setting liveliness to off
2012-05-15 11:30:46 -07:00
Brian Colonna
c775feb4a0 am 5a1c0cf4: Merge "Fix 6437474: Fixed black box appearing on rotation" into jb-dev
* commit '5a1c0cf492b0b2a96f779479d9aec4f4c3009847':
  Fix 6437474: Fixed black box appearing on rotation
2012-05-15 11:29:54 -07:00
Brian Colonna
ced0629205 am a5cf93a8: Merge "Fix 6283709: set max FUL failed attempts to 5" into jb-dev
* commit 'a5cf93a84aefd19da2f80ebab4f6f898e1744037':
  Fix 6283709: set max FUL failed attempts to 5
2012-05-14 19:33:03 -07:00
Dianne Hackborn
2da87ec32e am 2a7a6ca0: Merge "Implement new window cropping." into jb-dev
* commit '2a7a6ca00ab176105b5bbfa6b17bb0dcd058d517':
  Implement new window cropping.
2012-05-14 19:32:39 -07:00
Danielle Millett
05dde913f9 Merge "Setting liveliness to off" into jb-dev 2012-05-14 16:18:52 -07:00
Danielle Millett
46bbdec799 Setting liveliness to off
This is part of the change to remove the blink checkbox.  Since the
blink checkbox won't be visible anymore, we want to set liveliness to
off instead of checking the current value.

Change-Id: Iaa68cea8ec0a6012eaaaac77cea0f50575b7e660
2012-05-14 19:10:03 -04:00
Brian Colonna
5a1c0cf492 Merge "Fix 6437474: Fixed black box appearing on rotation" into jb-dev 2012-05-14 15:16:14 -07:00
Brian Colonna
a5cf93a84a Merge "Fix 6283709: set max FUL failed attempts to 5" into jb-dev 2012-05-14 07:56:07 -07:00
Brian Colonna
ffefd0fdd1 Fix 6283709: set max FUL failed attempts to 5
After an unrecognized face occurs 5 times in a row, we disable FUL
until the user unlocks via the backup lock.  This prevents attacks
where someone tries a bunch of different photos, hoping for a good
enough match to the device's owner.

This value was previously set to 15, which is much higher than
necessary.  This change sets it to 5.  We've been holding off on
this change because it makes our testing more difficult, but we
want this in there for factory ROM this week.

Change-Id: I4e1acc5b1dcc2c0629e0c0fe97a837d6edc44d5d
2012-05-14 10:34:08 -04:00
Brian Colonna
88240596fc Fix 6437474: Fixed black box appearing on rotation
The biometric unlock initializeView() function is called every time
the lockscreen is recreated.  Since this normally happens when the
device turns off, initializeView() was covering the backup lock so the
backup lock is not exposed when the device turns back on.  However,
initializeView() is also called when lockscreen is recreated due to an
orientation change.

With this change, the show() call to cover the backup lock has been
moved out of initializeView(), and the backup lock is now only covered
when the screen is turning off, preventing the backup lock from being
covered on an orientation change.

This also includes changes to prevent biometric unlock function calls
from occurring when SIM or Account unlock is in use.  In fact, in any
situation where we know FUL won't be used, we don't even construct it.
This is not only more efficient, but it also cuts down on the
possibility of errors where FUL is being used when it shouldn't be.

Change-Id: Ie97761840df8de5701703d9b9b991726fb601064
2012-05-14 10:06:05 -04:00
Dianne Hackborn
2a7a6ca00a Merge "Implement new window cropping." into jb-dev 2012-05-13 15:24:32 -07:00
Dianne Hackborn
85afd1b6f8 Implement new window cropping.
The window manager now performs the crop internally, evaluating
it every animation from, to be able to update it along with
the surface position.

Change-Id: I960a2161b9defb6fba4840fa35aee4e411c39b32
2012-05-13 13:31:06 -07:00
Jim Miller
a11b24ef12 am 01119de9: Merge "Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup" into jb-dev
* commit '01119de91d28d6e053ba2365ae6b1b03276446f0':
  Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup
2012-05-12 13:34:05 -07:00
Jim Miller
01119de91d Merge "Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup" into jb-dev 2012-05-12 13:31:41 -07:00
Jeff Brown
a48816375f am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev
* commit '58770232216cd735afdfd3dd53151070e06de5ce':
  Move power HAL interactions to PowerManagerService.
2012-05-11 19:35:23 -07:00
Jeff Brown
5877023221 Merge "Move power HAL interactions to PowerManagerService." into jb-dev 2012-05-11 19:32:56 -07:00
Jeff Brown
7304c34382 Move power HAL interactions to PowerManagerService.
This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server.  Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
2012-05-11 18:42:42 -07:00
Jim Miller
8818edbe2f Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup
This fixes a rare crash that could happen when the device orientation
changes while the handle is held over a target.  LockScreen.cleanUp()
was being called which set mCallback to null which then causes it
to crash in MultiWaveViewMethods.onTrigger().

The solution is to also remove OnTriggerListeners in LockScreen.cleanup().

Change-Id: I487c7c9dbbe40417e685b39f2e79b1c43b30fa00
2012-05-11 16:11:17 -07:00
Jim Miller
07827454ef am 2b5cebeb: Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev
* commit '2b5cebebb60c33fe864bed71778253837cbddb54':
  Fix 6040870: Update MultiWaveView for new device
2012-05-11 15:33:55 -07:00
Jim Miller
4c351d62e7 Fix 6040870: Update MultiWaveView for new device
This change allows more flexibility in target placement in MultiWaveView.
It now supports a new way of specifying chevron drawables that allows
them to be moved in directions corresponding to more than the four basic
directions (right, up, left, down).

Chevron drawables can now be updated in an overlay.

This change also adds a place holder and makes a minor tweak to the layout
on 720dp devices where the navbar buttons weren't centered.

Change-Id: Icd319ec5f276870380e27737c873e78f599ff751
2012-05-10 21:36:56 -07:00
Jeff Brown
3631131e5f am 571d4cbe: Merge "Fix bugs in fallback key handling." into jb-dev
* commit '571d4cbeec4adad050b8e188770e7e7dedc558f1':
  Fix bugs in fallback key handling.
2012-05-10 09:25:36 -07:00
Brian Colonna
86f25564c4 am e2d47e63: Merge "Added FUL client-side debug" into jb-dev
* commit 'e2d47e63cf1c5c095eb54f7af2a4a02b46862ddd':
  Added FUL client-side debug
2012-05-10 09:24:51 -07:00
Uriel Rodriguez
49eea136f8 am 363b6052: Merge "changed pokeWakelock() callback to take time in milliseconds" into jb-dev
* commit '363b60527ce82b0f56434e70a8124e4d41e2b1e0':
  changed pokeWakelock() callback to take time in milliseconds
2012-05-10 09:24:46 -07:00
Jeff Brown
571d4cbeec Merge "Fix bugs in fallback key handling." into jb-dev 2012-05-09 17:35:07 -07:00
Brian Colonna
e2d47e63cf Merge "Added FUL client-side debug" into jb-dev 2012-05-09 16:16:45 -07:00
Uriel Rodriguez
dff307697d changed pokeWakelock() callback to take time in milliseconds
Changed the pokeWakelock() call back to take one argument - the duration to stay awake in ms.  This
change was needed in order to poke the wakelock for the duration of the watchdog timeout.  This
must be done in the service because the duration of the watchdog timeout is unknown at this point.

Moved pokeWakelock() from start() to handleServiceConnected() to make sure that this poke happens
before the poke in the service.  This poke is still needed to account for when devices are rotated.

Change-Id: I19d62df1489514de0588ebb937678358e70ffc95
2012-05-09 19:08:22 -04:00
Jeff Brown
fd23e3ed97 Fix bugs in fallback key handling.
If a fallback key is generated using a key plus a modifier,
then it's possible we might get a different fallback key
generated if the modifier has changed.  PhoneWindowManager
needs to remember which fallback is last generated for a
given key code so that it can apply the same fallback action.

When generating cancellation events, it's important to have
preserved the policyFlags of the original event.  Otherwise
we may not dispatch the cancellation properly.  For example,
some actions are not performed if the POLICY_FLAG_TRUSTED
is not specified.

Remember the metaState associated with a key event so we can
include it when canceled.

Tell the policy when a fallback is being cancelled so that it
can clean up its state.

After a SEARCH shortcut is invoked, clear the flag indicating
that a shortcut is pending.  This is to prevent SEARCH from
getting stuck down in the case where we might forget to send
the up.  (Shouldn't happen anymore after the prior fixes.)

Bug: 5616255
Change-Id: I68f0a9679c7af464eaf31c099f2aa50b53fecf1f
2012-05-09 13:34:28 -07:00
Brian Colonna
cfeda767c8 Added FUL client-side debug
This is to help track down bug 6409767 and will be removed when that
bug is fixed.

Change-Id: I51df2fd7d14ecd8f311fdf2ae993ba4943764011
2012-05-09 15:35:18 -04:00
Brian Colonna
a197cb2b52 am 2c214493: Merge "Added checks to make sure FUL functions are on UI thread" into jb-dev
* commit '2c21449357f8e53e578ec8835ddfeeee0368814b':
  Added checks to make sure FUL functions are on UI thread
2012-05-09 09:46:05 -07:00
Brian Colonna
2c21449357 Merge "Added checks to make sure FUL functions are on UI thread" into jb-dev 2012-05-09 09:44:05 -07:00
Brian Colonna
22001c1f96 Added checks to make sure FUL functions are on UI thread
There are three functions in FaceUnlock.java that have the requirement
that they are to be called on the UI thread.  I added checks to log
an error if they are ever called off of the UI thread.

Change-Id: I581968e8138b7561b7ad75a1ac6945bf218e2bcf
2012-05-09 11:16:04 -04:00
Adam Powell
4689b2843f am 1e5c3336: Merge "Fix measurement for dialog windows that do not have fixed width" into jb-dev
* commit '1e5c3336e8b16c0a46542f59df53f0fa31d82d6d':
  Fix measurement for dialog windows that do not have fixed width
2012-05-09 01:49:54 -07:00
Eric Laurent
776339fe4c am c8ade15d: Merge "Silent and Vibrate mode clean up" into jb-dev
* commit 'c8ade15dadd680c5e4b201f3b7b0823a13dedb3e':
  Silent and Vibrate mode clean up
2012-05-09 01:48:30 -07:00
Jeff Brown
e8e94a0743 am 41a4704b: Merge "Small tweaks to orientation." into jb-dev
* commit '41a4704b09f98723f4ddec895c9f2e651a5c0c8e':
  Small tweaks to orientation.
2012-05-09 01:45:49 -07:00
Adam Powell
b8e056a8e8 Fix measurement for dialog windows that do not have fixed width
Bug 6456773

Change-Id: I9d058f78c4b1c1759aaea2f215efee82a3489faa
2012-05-08 19:04:29 -07:00
Eric Laurent
bffc3d1bd3 Silent and Vibrate mode clean up
Clean up related to new Vibration policy.
The vibrate behavior is now only derived from:
 - presence of a vibrator on the device
 - current ringer mode selected: NORMAL, VIBRATE or SILENT
If no vibrator is present the ringer mode can only be NORMAL or SILENT.

The control of ringer mode via volume keys when volume keys control the "master"
stream type (RING on phones, MUSIC on tablets) is as follows:
If a vibrator is present:
 VOL- and volume equals 1: NORMAL => VIBRATE
 VOL- and volume equals 0 and not continuous press: VIBRATE => SILENT
 VOL+ and in SILENT mode: SILENT => VIBRATE
 VOL+ and in VIBRATE mode: VIBRATE => NORMAL, volume = 1
If no vibrator is present:
 VOL- and volume equals 0 and not continuous press: NORMAL => SILENT
 VOL+ and in SILENT mode: SILENT => NORMAL, volume = 0

VIBRATE_ON and VIBRATE_IN_SILENT settings are not stored/retreived any more.

AudioService checks and corrects ringer mode and stream volumes if necessary when reading from
DB at boot time.

Also:
 Added dump for stream volumes in AudioService.
 Added device names missing in AudioSystem for USB accessory and USB device.

Issue: 6036529
Issue: 6414950
Issue: 6448163

Change-Id: I77fb821ec63e4e566320cac2701b4ac466e86aef
2012-05-08 15:10:37 -07:00
Jeff Brown
41a4704b09 Merge "Small tweaks to orientation." into jb-dev 2012-05-07 18:55:20 -07:00
Jeff Brown
daf5d894ef Small tweaks to orientation.
Improved threshold for detecting external acceleration.

Bug: 5976859
Change-Id: Iaf2298fba8eda72d1cacbb2f3aea72f460a9262f
2012-05-07 18:30:18 -07:00