2426 Commits

Author SHA1 Message Date
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
8531a0bec7 am 1ed908ec: am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
* commit '1ed908ec3762da543143b84144cc4bf7743e2da6':
  Don't pop the IME for passwors at ScreenOn on tablets.
2012-11-08 15:38:19 -08:00
John Spurlock
8c47c2d377 am b4119441: am 1ef6398e: am 3dcb3628: am 34c4fe52: Fix remaining jank in secure add-widget transition.
* commit 'b4119441a026a04ebf3f622d91a172d5ebaa8fcb':
  Fix remaining jank in secure add-widget transition.
2012-11-08 15:38:11 -08:00
Michael Jurka
069d5ee9ac am 9d15b4cb: am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
* commit '9d15b4cb70e0141bb5fe4e266bb505b4f84eb1ec':
  Allowing rotation while adding lockscreen widgets
2012-11-08 15:38:07 -08:00
Adam Powell
eaa0cc8a37 am c4e0614b: am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking
* commit 'c4e0614bcaf6e4cabb7b532d876ed1c2fe7a85bf':
  Keyguard layout tweaking/reworking
2012-11-08 15:37:59 -08:00
Jim Miller
8f58627586 am f920a272: am 63ef8dc0: am 52bf955e: am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev
* commit 'f920a2729bea34ebabefc287e2d03eaccf3049fb':
  Fix emergency call area updates.
2012-11-08 15:37:51 -08:00
Adam Cohen
6ad77ee8f3 am 416d4862: am 24d230e9: am 16a3f4c9: am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev
* commit '416d4862484690448899a99959fe390b5c87913c':
  Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
2012-11-08 15:37:47 -08:00
Michael Jurka
7df23b0c51 am d31bc8ca: am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
* commit 'd31bc8ca2ce4c1288f14cf650944c9b65a588b72':
  Removing sticky widgets in lockscreen
2012-11-08 15:37:43 -08:00
Jim Miller
7779c83a36 am fcb80423: am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
* commit 'fcb8042316bad141cab189de6dfacd60e8d09848':
  Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-08 15:37:30 -08:00
Adam Powell
f423fbc78e am 412545f7: am f2d7c67f: am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
* commit '412545f7f05f15ed0c2a6c98f1221b48bf28f11c':
  Keyguard - MultiPaneChallengeLayout measurement/layout changes
2012-11-08 15:37:18 -08:00
Chris Wren
b3e2d832a7 am e2b6a935: am f5dc0a19: am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
* commit 'e2b6a935962b2697d4b9896188449d94a79d8331':
  animating challenge closed should close the challenge.
2012-11-08 15:37:10 -08:00
Winson Chung
c05ad9a293 am b10df88b: am 267214f4: am 43ecd191: am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.
* commit 'b10df88b0279355593b0ef8ccae5e4e9853236e1':
  Using screen dimensions to calculate the expanded PagedView dimensions.
2012-11-08 15:37:06 -08:00
Danielle Millett
8cd2f5bc64 am 6b646e82: am ae54cd6e: am 2f4be247: am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
* commit '6b646e82050c4364b400c1780b70131eea200439':
  Removing callbacks in onDetachedFromWindow, fixes b/7465673
2012-11-08 15:36:54 -08:00
Adam Cohen
057c5390c5 am 4d6d5f18: am e5785461: am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
* commit '4d6d5f185c6b09e5d82ab9ee59539b9a96322004':
  Making sure the sticky widget logic works with music
2012-11-08 15:36:50 -08:00
Chris Wren
f62039370a am abbf79c6: am 66425daf: am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
* commit 'abbf79c6f5319d826d5b93b0e186d8429a78b903':
  make challengeShowing sticky across bounce.
2012-11-08 15:36:35 -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
Winson Chung
b10df88b02 am 267214f4: am 43ecd191: am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.
* commit '267214f4e63f0cf01918a4f491d40b79dcb6ab57':
  Using screen dimensions to calculate the expanded PagedView dimensions.
2012-11-08 15:32:13 -08:00
Danielle Millett
6b646e8205 am ae54cd6e: am 2f4be247: am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
* commit 'ae54cd6e3d34bebb344156e36ba2a78c0a3cdf72':
  Removing callbacks in onDetachedFromWindow, fixes b/7465673
2012-11-08 15:32:05 -08:00
Adam Cohen
4d6d5f185c am e5785461: am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
* commit 'e5785461b753f68258c9609754f158f3dbf5fb26':
  Making sure the sticky widget logic works with music
2012-11-08 15:32:01 -08:00
Chris Wren
abbf79c6f5 am 66425daf: am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
* commit '66425daffc4442693a0dddb6323362877507cc28':
  make challengeShowing sticky across bounce.
2012-11-08 15:31:42 -08:00
Jean-Baptiste Queru
7c8d2b63c0 Merge from jb-mr1-dev-plus-aosp
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
2012-11-08 15:19:11 -08:00
Adam Cohen
c276e82dd0 Deferring size callbacks until boot completed (issue 7469267)
-> Also bumping priority of the boot completed receiver

Change-Id: I7b68a29b4a8c927713bfbc1f4585f96ce0c47f35
2012-11-08 14:56:36 -08:00
Jean-Baptiste Queru
21fc49ac74 Merge commit 'ac20bfe1' into HEAD 2012-11-08 14:51:15 -08:00
Jean-Baptiste Queru
c23cfe57a9 Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD 2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
32f504729b Merge commit 'ef44a77f9181c13140c67988356b3ed3f5177434' into HEAD 2012-11-08 14:48:36 -08:00