John Spurlock
fe15574e19
am 92cabadf: am dc3d76f2: Merge "Refactor the lockscreen camera widget, removing the bitmap." into jb-mr1.1-dev
...
* commit '92cabadf900e5489c33599becebc8265569d57ff':
Refactor the lockscreen camera widget, removing the bitmap.
2012-11-20 16:05:10 -08:00
Brian Colonna
5eb83aa896
Ignoring FUL unlock signal if user changed fixes b/7572354
...
Prior to this fix, one user could log into another user's account by
waiting for FUL to recognize them on their account, and then
switching to another account at a very precise time - after FUL has
recognized the user but before the device has unlocked.
This was caused by the FUL unlock() callback telling the device to
unlock even though the user had changed. The fix is to only unlock
the device if the current user ID matches the user ID used to run
FUL.
Change-Id: I516b52d99ab7609b836939e4aae6e7df77a9e047
2012-11-19 17:45:44 -05:00
John Spurlock
0552c5d75a
Refactor the lockscreen camera widget, removing the bitmap.
...
The new approach is to create two views:
- Widget preview, drawn at full-size, then scaled to fit frame.
- Fullscreen preview, drawn at full-size, used during animation.
Two views are necessary to both ensure the widget scrolls properly
with the widget page yet still appears to scale up and match
the camera app pixel for pixel.
The offscreen bitmap and associated background rendering is no
longer necessary. This avoids the large allocation and associated
rendering time after turning screen on.
Also fixes 1px horizontal discrepancy during old scale-up anim.
Also suppresses long-click behavior on the camera widget.
Bug:7471107
Bug:7559755
Change-Id: I1d834aa743bc05d6a7e2ce3eadfee8d5ff40da37
2012-11-19 16:32:30 -05:00
Michael Jurka
3366a5d54e
am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
...
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
Delete appWidgetId when removing lockscreen widgets
2012-11-16 15:34:20 -08:00
Michael Jurka
75b5cfb4a4
Delete appWidgetId when removing lockscreen widgets
...
Bug: 7550012
Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
2012-11-16 15:22:06 -08:00
Craig Mautner
07f1a6ceca
am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '78db850049b2312a82f408373d22c83c5ad8fa56':
Synchronize access to Locked methods. DO NOT MERGE
2012-11-13 08:33:19 -08:00
Craig Mautner
2c37f7b455
Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev
2012-11-13 08:27:22 -08:00
John Spurlock
4299f63e54
am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
...
* commit 'b340fe4f88226ec35f0a4058f514b764b0f3977d':
Disable navbar searchlight if search assist not available.
2012-11-12 07:58:09 -08:00
John Spurlock
43d84518f2
Disable navbar searchlight if search assist not available.
...
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
2012-11-09 10:27:33 -05:00
Craig Mautner
d86159067f
Synchronize access to Locked methods. DO NOT MERGE
...
onConfigurationChange was calling maybeCreateKeyguardLocked
without actually holding the lock. Now the call to
maybeCreateKeyguardLocked is synchronized.
May fix bug 7094175.
Change-Id: I3171a18e25f54506f614f9c2cc09aa20080bd6bb
2012-11-08 22:44:47 -08:00
Adam Cohen
483041c9c4
am ecba011f: am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev
...
* commit 'ecba011fd81386895fda02a7d132eadf5c710ae0':
Preventing more than five widgets from being added in the carousel (issue 7502935)
2012-11-08 18:08:57 -08:00
Adam Cohen
d5759ecf1f
am a49ab4f8: am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev
...
* commit 'a49ab4f8f17d9c222275c6196220838528629c66':
Deferring size callbacks until boot completed (issue 7469267)
2012-11-08 18:08:53 -08:00
Adam Cohen
f69320a1f0
Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev
2012-11-08 16:36:56 -08:00
Adam Cohen
3e9cba4f9d
Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev
2012-11-08 16:35:42 -08:00
Dianne Hackborn
e0d454d2e8
am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
...
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
Remove extraneous logs.
2012-11-08 15:47:46 -08:00
Daniel Sandler
77f2e27e68
am 9b15f2e5: am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
...
* commit '9b15f2e57520d89fdd350a23ca97db36c3e5b7ca':
Don't crash if no ECA.
2012-11-08 15:47:40 -08:00
Daniel Sandler
8d62faea22
am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
...
* commit 'c4639949d20077a58f92e675b16d45dabf964b0c':
Only show the bouncer for the assistant if secure.
2012-11-08 15:47:33 -08:00
John Spurlock
2a1e6a69a7
am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..."
...
* commit '180484115fcf061d6fbb5637d614d7c88d5d8053':
Address comments from merged "Fix remaining jank in sec..."
2012-11-08 15:47:29 -08:00
Michael Jurka
9d31d103b3
am 1470297c: am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets
...
* commit '1470297c4d0db5d90785b88c8ddf79119720bd42':
Enforce max number of 5 lockscreen widgets
2012-11-08 15:47:17 -08:00
Adam Cohen
5d92a50efd
am 06b29549: am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
...
* commit '06b29549fb9819ed763c401ca471c051805fc7b4':
Adding user activity when the challenge is slid down
2012-11-08 15:47:12 -08:00
Jim Miller
061b4fae3d
am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
Add mechanism to kick keyguard to show the assistant
2012-11-08 15:47:04 -08:00
Adam Powell
70eeec5c06
am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
...
* commit '79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b':
add bouncer frame to glowpad.
2012-11-08 15:46:58 -08:00
Adam Powell
2f63c24e72
am d7aaf3af: am f3eaabb9: am a9fa92e8: Keyguard - force showing the status bar
...
* commit 'd7aaf3af31f2f16753883c263eb7812493a3b123':
Keyguard - force showing the status bar
2012-11-08 15:46:51 -08:00
Jim Miller
8b26141a6c
am 670f5a52: am e0dd7c46: am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.
...
* commit '670f5a52b0a6c9c74541af06929152a54e53fe8b':
Disable interactive mode for full-screen security views in keyguard.
2012-11-08 15:46:47 -08:00
Adam Cohen
ee9bb25a3a
am 230719c7: am 640cf0ab: am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
...
* commit '230719c7b5da0d36bd4e475cfba258011ab32d95':
Clean up some flashy jank (issue 7454766)
2012-11-08 15:46:39 -08:00
Winson Chung
462222fc5d
am 10bcc7d9: am 18825966: am 70c2f873: Synchronizing bouncer duration with page scaling duration.
...
* commit '10bcc7d95827884de2131fc316a24c9e6facee1e':
Synchronizing bouncer duration with page scaling duration.
2012-11-08 15:46:36 -08:00
Adam Powell
805f386d51
am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
...
* commit 'ef79efdc479ea8d5ec623c14260e775f9e6a474b':
Fiddle with keyguard glowpad layouts
2012-11-08 15:46:25 -08:00
Winson Chung
60873ddec1
am 8c5ebad0: am 062e01c5: am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.
...
* commit '8c5ebad0033de401130d2367ec40d826691542ee':
Adding workaround to fix issue where the bouncer animation had the wrong pivot.
2012-11-08 15:46:21 -08:00
Jim Miller
87d6e4be88
am 426348ae: am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
...
* commit '426348ae8158f84c034310e08602362bd1a02072':
Don't handle click events on the emergency button in bouncer mode
2012-11-08 15:46:18 -08:00
Adam Powell
10bd6403b5
am b4c8cf6a: am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
...
* commit 'b4c8cf6ac473c33d946043b2e4cc9f7ba91dd8ce':
Use stable layouts for keyguard/SlidingChallengeLayout
2012-11-08 15:46:11 -08:00
Daniel Sandler
ebb0b118f1
am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
...
* commit '98a53594aebc86491641b44649d0178a7bec0d79':
Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
2012-11-08 15:46:03 -08:00
Winson Chung
1540a21f3d
am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
...
* commit '29f161781c4544c7b1e78c8d1ae07605b3dcde86':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 15:45:59 -08:00
Adam Cohen
bd8c736bfd
am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
...
* commit '79d4bf6e2f241d9d648789cdd5170e48614cc764':
Fixing up overscroll asset / sizing
2012-11-08 15:45:55 -08:00
Jim Miller
2a72038ae2
am e7bb1f69: am 4bd4b78f: am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
...
* commit 'e7bb1f690e3e9d6406dd27390ec35a0a81922541':
Add one more check for detecting crashes while inflating multiuser widget
2012-11-08 15:45:51 -08:00
Jim Miller
0927eb2112
am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
...
* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
Implement fallback clock in keyguard
2012-11-08 15:45:43 -08:00
Michael Jurka
27ecdf8e33
am b40f9408: am 090c790c: am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev
...
* commit 'b40f9408f59b06f75ffc7fbdcc6d833183d77d18':
Fix bug where newly added widget wasn't always shown
2012-11-08 15:45:39 -08:00
Adam Powell
605ada850a
am d921f604: am 0fcb5cda: am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
...
* commit 'd921f604409f5715dd65d59af81274b2614c2476':
Fix keyguard measurement bugs
2012-11-08 15:45:31 -08:00
Chris Wren
9ede3fd568
am 483483f8: am c0cbe8ab: am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
...
* commit '483483f85ecc193457b8c68c28e502f43389ec13':
add logging to enableUserSelectorIfNecessary.
2012-11-08 15:44:13 -08:00
Chris Wren
eac1e897bb
am 29cc9489: am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
...
* commit '29cc94898ff6e851ddd22d53e12f96524d9074a9':
add some defensive code to enableUserSelectorIfNecessary.
2012-11-08 15:44:09 -08:00
Adam Cohen
6da1fdd101
am fdfa4b7d: am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
...
* commit 'fdfa4b7d52d0e83f78b6b9fe6eb3c1da083cc4d8':
Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
2012-11-08 15:43:55 -08:00
Chris Wren
1ed908ec37
am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
...
* commit '193cd46c47e7552c6b92b20aef51064d87e88d84':
Don't pop the IME for passwors at ScreenOn on tablets.
2012-11-08 15:33:31 -08:00
John Spurlock
b4119441a0
am 1ef6398e: am 3dcb3628: am 34c4fe52: Fix remaining jank in secure add-widget transition.
...
* commit '1ef6398e93eefe08ae7195e83f04910610568f28':
Fix remaining jank in secure add-widget transition.
2012-11-08 15:33:20 -08:00
Michael Jurka
9d15b4cb70
am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
...
* commit '5dc8ce48d80c339070b626903a57846d4357c2f2':
Allowing rotation while adding lockscreen widgets
2012-11-08 15:33:16 -08:00
Adam Powell
c4e0614bca
am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking
...
* commit 'e7394d1eef3ef8a89ec6ceea8f0318f38ac67b33':
Keyguard layout tweaking/reworking
2012-11-08 15:33:09 -08:00
Jim Miller
f920a2729b
am 63ef8dc0: am 52bf955e: am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev
...
* commit '63ef8dc03021faeb51af22868fcf7631f9383a1a':
Fix emergency call area updates.
2012-11-08 15:33:01 -08:00
Adam Cohen
416d486248
am 24d230e9: am 16a3f4c9: am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev
...
* commit '24d230e9e972451b15326c819247163132709796':
Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
2012-11-08 15:32:57 -08:00
Michael Jurka
d31bc8ca2c
am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit 'f142427244dde3e467b126df4840f496e09cef56':
Removing sticky widgets in lockscreen
2012-11-08 15:32:53 -08:00
Jim Miller
fcb8042316
am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit '8920c259c8f5c63e4fae40f00afb185daa8008fb':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-08 15:32:40 -08:00
Adam Powell
412545f7f0
am f2d7c67f: am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
...
* commit 'f2d7c67f946deb6ba3ba224f1e4d2f3454058da2':
Keyguard - MultiPaneChallengeLayout measurement/layout changes
2012-11-08 15:32:24 -08:00
Chris Wren
e2b6a93596
am f5dc0a19: am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
...
* commit 'f5dc0a19acd17d827b932e78373530508ea70fe4':
animating challenge closed should close the challenge.
2012-11-08 15:32:17 -08:00