2169 Commits

Author SHA1 Message Date
Danielle Millett
080471e410 Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev 2012-10-31 21:44:05 -07:00
Danielle Millett
5d2404da57 Updating isShowing during onResume()
Since the callback is unregistered in onPause(), KeyguardFaceUnlock
doesn't get onKeyguardVisibilityChanged() when it's paused.  This means
that if the state changes while it's paused, then mIsShowing is incorrect
when it resumes.  This is fixed by keeping track of the state in
KeyguardUpdateMonitor and checking it when onResume() is called.

Change-Id: I67aa1e091161a965e4347dc8c2ec5e7a1dd9d92e
2012-11-01 00:05:27 -04:00
Michael Jurka
2fd2fe3348 am 345c0fa0: am 40d90211: am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
* commit '345c0fa06c246efde48526fd56e0830678e1759b':
  Use new keyguard appwidget picker
2012-10-31 20:39:48 -07:00
Adam Powell
919227abe3 am 65d33bac: am 302b6819: am 077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
* commit '65d33bacd7b2a85147763a9e025effe306ad3741':
  Fix some drag behavior bugs in keyguard
2012-10-31 20:39:43 -07:00
Svetoslav Ganov
3daa9c3bc4 am b5447463: am 0c777537: am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
* commit 'b5447463654a2aa319cb33c266b688391f529dfc':
  Fix keypad accessibility.
2012-10-31 20:39:11 -07:00
Jim Miller
96d9e1d0e5 am ea6c15ef: am 57dcf248: am 170c8d93: Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev
* commit 'ea6c15ef501bd30943d525f3cafccfd8057007a8':
  Remove extra KeyguardViewStateManager construction
2012-10-31 20:38:51 -07:00
Chris Wren
2ac2b4d41b am 594a1918: am 5bbf7ef8: am f778bfdf: Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev
* commit '594a1918efb0b58d50d121655876f489b111bb19':
  Update bouncer behavior on tablets.
2012-10-31 20:38:47 -07:00
Brian Colonna
9986b2d285 Merge "Suppressing FUL after going to backup fixes b/7449820" into jb-mr1-lockscreen-dev 2012-10-31 20:19:23 -07:00
Brian Colonna
667b5d58b9 Suppressing FUL after going to backup fixes b/7449820
Face Unlock would reappear when rotating a tablet after it had already
fallen back to the backup unlock method.  This change suppresses Face
Unlock after going to the backup so it isn't seen again until the user
leaves and revisits keyguard.

This change also removes the exposeFallback() callback from Face
Unlock.  It has been unnecessary for a long tiem since Face Unlock no
longer covers the backup.  The Face Unlock service was therefore
making unnecesaary calls via the AIDL interface.

Note that the AIDL interface change broke obsolete keyguard stuff.
That is being deleted soon anyway, so code has just been commented out
of the obsolete files to make it compile.

Change-Id: Ia5c451cce1703b3bc03e27a35c6b38373e944d1b
2012-10-31 23:07:00 -04:00
Svetoslav Ganov
45942ca052 Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
Change-Id: I4e9cf37aba287f079be18e5c2c25216e6fdd1396
2012-10-31 19:46:24 -07:00
Adam Powell
3119c00db7 am 055f001f: am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
* commit '055f001f76950e4a504a6bea059310a455281134':
  Fix keyguard bugs
2012-10-31 19:45:27 -07:00
Jim Miller
21c9c6a87b am 0b063f31: am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
* commit '0b063f31035b98d20899468f5f71c0d577b16d0c':
  Re-enable transition animation between face unlock and backup
2012-10-31 19:45:19 -07:00
Jim Miller
873d6e911c am 99e8692a: am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
* commit '99e8692ace643f2e6a41530dc05411f707e0394b':
  Fix potential null pointer exeption in keyguard
2012-10-31 19:45:15 -07:00
Svetoslav Ganov
0c77753749 am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
* commit 'cdb80888b7c0c987223011fc4a358b458decf567':
  Fix keypad accessibility.
2012-10-31 19:37:10 -07:00
Jim Miller
57dcf248d6 am 170c8d93: Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev
* commit '170c8d930e7ca0c913d1e1b1e16f9ac03f323a6d':
  Remove extra KeyguardViewStateManager construction
2012-10-31 19:36:51 -07:00
Chris Wren
5bbf7ef83d am f778bfdf: Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev
* commit 'f778bfdfa7f2022599b819ba6075e2e9e4d46329':
  Update bouncer behavior on tablets.
2012-10-31 19:36:47 -07:00
Jim Miller
11952e73af Merge "Adding a button for expanding the clock screen challenge." into jb-mr1-lockscreen-dev 2012-10-31 18:54:38 -07:00
Adam Powell
45d2f16487 am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
* commit 'e74fcc0eb15a0ea16d55e03c80a8442e09e16aee':
  Fix keyguard bugs
2012-10-31 18:38:06 -07:00
Jim Miller
2bf287c884 am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
* commit '162fc8e64be6a6c357d39d36906ac7e36f07ed33':
  Re-enable transition animation between face unlock and backup
2012-10-31 18:37:59 -07:00
Jim Miller
c3ab855a35 am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
* commit 'e0ec5d428f80fe49b291a0e0edd51a4398bde609':
  Fix potential null pointer exeption in keyguard
2012-10-31 18:37:55 -07:00
Svetoslav Ganov
74bdd21629 Adding a button for expanding the clock screen challenge.
Change-Id: Ia39303012251cf7cc4dadac030d1aa471ceff776
2012-10-31 18:25:16 -07:00
Brian Colonna
a6314da24e Merge "FUL being unsuppressed when screen turns off fixes b/7453702" into jb-mr1-lockscreen-dev 2012-10-31 18:15:36 -07:00
Svetoslav Ganov
c4842c1193 Accessibility support for the lockscreen - phone.
Change-Id: Idc99f1322a1d635dd07e1f5efa1665a4676267c2
2012-10-31 17:49:10 -07:00
Michael Jurka
c8dc8eb327 Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev 2012-10-31 17:10:11 -07:00
Brian Colonna
078f5919a9 FUL being unsuppressed when screen turns off fixes b/7453702
We suppress FUL when the device first boots because with all of the
things happening at boot, we don't want to interact with the camera.
We also suppress it immediately after a user switch for the same
reasons.  However, once the user turns the screen off, we want to
show FUL when they turn it back on.  Prior to this fix it was only
being unsuppressed on login.

Note that this CL also removes the isFirstBoot flag.  It was only
being set/checked when the suppress flag was set/checked, so it was
redundant.

This also addresses bug b/7450665, which is regarding the
user-switch case.

Change-Id: I2b39e85e21c08ef7629398521ab1159f5a6c7547
2012-10-31 20:03:18 -04:00
Adam Powell
077105bae3 Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev 2012-10-31 17:01:32 -07:00
Adam Powell
fa668cc930 Fix some drag behavior bugs in keyguard
Integrate from proto app

Make sure you can drag back up immediately without the delay of extra
offset on the challenge view.

There are still a few further tweaks to make here that will be
dependent on another upcoming patch.

Change-Id: I6af599e43d6be6da7b431dca5b87e39c157a54df
2012-10-31 17:01:38 -07:00
Michael Jurka
fc753c0cf6 Use new keyguard appwidget picker
Also, remove ability to filter widgets by feature
in appwidget picker in anticipation of api change

Change-Id: I325de0b98f03d3a250758d504229ea27794b5330
2012-10-31 16:53:04 -07:00
Jeff Brown
6f0888864a am 5c43c889: am 427279fb: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit '5c43c88945945fbf833b05d2ed851d5e43bef4b5':
  Fix dream/keyguard infinite layout loop.
2012-10-31 16:50:49 -07:00
Jeff Brown
409c89c358 am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit 'c1c53e56fb5222bfdd17f0a9f735efe5c1b8cb70':
  Fix dream/keyguard infinite layout loop.
2012-10-31 16:45:01 -07:00
Jeff Brown
c1c53e56fb Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 2012-10-31 16:42:26 -07:00
Svetoslav Ganov
cdb80888b7 Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev 2012-10-31 15:06:32 -07:00
Jim Miller
170c8d930e Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev 2012-10-31 12:37:54 -07:00
Jim Miller
03633d28db Remove extra KeyguardViewStateManager construction
Change-Id: I0f64569876d923c2b4b7ac3918f3a0458a56b16c
2012-10-31 12:35:45 -07:00
Chris Wren
c345146a3a Update bouncer behavior on tablets.
Bug: 7411293
Change-Id: I1000987b9b5d481d04e095c4f8eb9eda44a81021
Proto:Id: I81fcf3541a81812b212963a5c4b379424506bc5a
2012-10-31 15:31:20 -04:00
Dave Burke
39a8790574 am 026c6254: am ee6e3354: am 86e1b966: Fix ordering bug
* commit '026c6254d71bba9924eca0ae07230f3b6005758b':
  Fix ordering bug
2012-10-30 21:56:13 -07:00
Dave Burke
86e1b96666 Fix ordering bug
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
2012-10-30 21:45:12 -07:00
Adam Powell
e74fcc0eb1 Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev 2012-10-30 21:00:40 -07:00
Adam Powell
cdf8b48745 Fix keyguard bugs
Integrate from proto app

Get some layout/alignment right between security views, bouncer,
etc. Expand the space available for the more cramped security views
when not in the bouncer.

Fix bug 7434391 - don't allow widget swiping in bouncer mode. Fix a
few other bouncer-related state tracking problems as well.

Use layers when moving the security view around.

Change-Id: Ied14bab8bb5c3d997c734a3ae657b766c427253f
2012-10-30 20:57:10 -07:00
Michael Jurka
3c416dfcc0 Merge "Fix crash on boot" into jb-mr1-lockscreen-dev 2012-10-30 20:55:49 -07:00
Michael Jurka
536f067c34 Fix crash on boot 2012-10-30 20:50:21 -07:00
Jim Miller
162fc8e64b Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev 2012-10-30 20:43:52 -07:00
Jim Miller
22ae05d50c Re-enable transition animation between face unlock and backup
Change-Id: Ia90cf73e400f45c8b73f34cbc521dcbc62258ca8
2012-10-30 20:37:57 -07:00
Jim Miller
e0ec5d428f Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev 2012-10-30 20:18:10 -07:00
Jim Miller
82b517be0b Fix potential null pointer exeption in keyguard
The code was adding default widgets before setting mViewStateManager, which means the
callback from the transport control might access mViewStateManager before it's set.

Change-Id: I985a3c8062d0660519cb4a4c8c1b42c7c90f4ac7
2012-10-30 20:12:53 -07:00
Jeff Brown
c8018ebe7c Fix dream/keyguard infinite layout loop.
Bug: 7427191
Change-Id: If48d39cf890274607fd13cdd4d85c6c234ce5a2c
2012-10-30 18:40:54 -07:00
Ed Heyl
b7df8c9630 am ec71d5d8: am 31dfff78: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit 'ec71d5d8e2e4ff5eb2ca0bd765326806c19e698a':
  Fix content alpha
  Removed makeInvisible() function
  Making the reordering play nice with the 3D widget carousel
  Fixed misplacement of cancel(X) button for Face Unlock
  Fill in logic in WidgetPager to ignore music when reordering.
  Attempt to fix bug on devices where multi-user support is disabled.
  Implement correct music widget positioning in keyguard
  Render camera widget correctly after shell restart.
  Moving persistence calls to background.
  FUL uses square aspect ratio for all layouts fixes b/7426399
  Addressing a couple comments on previous CL
  Impose a height & width downward on challenge views.
  Fixing some regressions in tablet reordering/deleting.
  Disable lockscreen window anim when launching camera.
2012-10-30 18:13:05 -07:00
Adam Cohen
a371e5315e Merge "Fix content alpha" into jb-mr1-lockscreen-dev 2012-10-30 17:51:03 -07:00
Adam Cohen
ab8635d179 Fix content alpha
Change-Id: I13e8ad73baf768976240c1c7c5a2cb05d5d62061
2012-10-30 17:40:43 -07:00
Danielle Millett
a0a230abf3 Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev 2012-10-30 17:33:55 -07:00