95373 Commits

Author SHA1 Message Date
Daniel Sandler
da576c1ca3 am 59127284: am 334d66ed: am 6f562e9f: am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
* commit '591272848a84e6772ff3e4f82148bae4939d6af3':
  Show the assist ring on center-button longpress on lockscreen.
2012-11-08 15:38:30 -08:00
Baligh Uddin
9e221c7a56 am a1a229da: (-s ours) am 9310aa18: am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'a1a229daa2798acb6719e1119cdb6afd3281d887':
  Import translations. DO NOT MERGE
2012-11-08 15:38:26 -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
Brian Colonna
a2e07821d8 am 318e8189: am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
* commit '318e81896b46b33d01c942ed82387bd087e65c65':
  Centering FUL fixes b/7480608
2012-11-08 15:38:15 -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 Cohen
df8a020c61 am 0c06c2b3: am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
* commit '0c06c2b35c50a8391fb95e8f9b277e0b9899c1c1':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-08 15:38:03 -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
Daniel Sandler
2a08223fd6 am 744fa85f: am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit '744fa85f12fdb4b601339c12abe342ada2dc8e18':
  Updated assets.
2012-11-08 15:37:55 -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
Svetoslav Ganov
87d67d2f77 am a8bc8a5a: am 00a0ed03: am 1cbb449c: am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit 'a8bc8a5a9888b68a78564c13c0e5406d119302ae':
2012-11-08 15:37:38 -08:00
Sascha Prueter
680951d978 am 586f02f7: am 7286ff58: am 62855332: am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '586f02f7d1b3960a2d5d93cd70e01808636e0f22':
2012-11-08 15:37:34 -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
Romain Guy
0c8f14bdb9 am 9f6f38ae: am 4e889f00: am 96f6491a: am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit '9f6f38aeb83879cc904a8c456caf6d37d8a33d6e':
2012-11-08 15:37:26 -08:00
Eino-Ville Talvala
e30be207c0 am 077b81ff: am 75dd6d2f: am f83ace0b: am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '077b81ff83c492a9bc9fdfa0db1d045d805af844':
2012-11-08 15:37:22 -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
Victoria Lease
8bfe33cb12 am e006945d: am b69c08a8: am b000c362: am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit 'e006945d34e9149796612768911d7c8bfd8d15ee':
2012-11-08 15:37:14 -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
Jim Miller
d97b09b0f3 am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
* commit 'bef827572ce9644253ea42ab91b11b8107d2300f':
  Add isSafeModeEnabled() API to WindowManagerService
2012-11-08 15:37:01 -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
Adam Cohen
1c2576ae18 am 1b19b519: am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
* commit '1b19b519e659783236661fecf22f4f8897742dc3':
  Attempted fix for issue 7469415
2012-11-08 15:36:45 -08:00
Amith Yamasani
77e168461b am fda301cf: am 9862ac9c: am 22559dc5: am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit 'fda301cf7590efa6cfbbce66b8693093c3be69e2':
2012-11-08 15:36:38 -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
Daniel Sandler
591272848a am 334d66ed: am 6f562e9f: am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
* commit '334d66ed41bbeb3456ee1366428076e85c875b7d':
  Show the assist ring on center-button longpress on lockscreen.
2012-11-08 15:33:41 -08:00
Baligh Uddin
a1a229daa2 am 9310aa18: am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '9310aa18865221ea8bf16345565313cc71f2d5f2':
  Import translations. DO NOT MERGE
2012-11-08 15:33: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
Brian Colonna
318e81896b am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
* commit '1e85c8edfb39aa951134599b6019a7fa4fc8b4a7':
  Centering FUL fixes b/7480608
2012-11-08 15:33:27 -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 Cohen
0c06c2b35c am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
* commit '580657a34851c29f013586578241d2f4d6dc4f5d':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-08 15:33:13 -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
Daniel Sandler
744fa85f12 am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit 'f6a5070bf59ecc5497196f923930d28286b49287':
  Updated assets.
2012-11-08 15:33:05 -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
Svetoslav Ganov
a8bc8a5a98 am 00a0ed03: am 1cbb449c: am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit '00a0ed03b2f740666d60b75b44b8c5ab21910a02':
2012-11-08 15:32:49 -08:00
Sascha Prueter
586f02f7d1 am 7286ff58: am 62855332: am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '7286ff586b6be315045bb15392651065d634dfc3':
2012-11-08 15:32:46 -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
Romain Guy
9f6f38aeb8 am 4e889f00: am 96f6491a: am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit '4e889f008b148ab8d557c4d1d77bdb715a401383':
2012-11-08 15:32:36 -08:00
Eino-Ville Talvala
077b81ff83 am 75dd6d2f: am f83ace0b: am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '75dd6d2fa180af352ed55b24a0ebc83a6a3f552a':
2012-11-08 15:32:32 -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
Victoria Lease
e006945d34 am b69c08a8: am b000c362: am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit 'b69c08a832a9b5d45273bcf694d7177f23b734f7':
2012-11-08 15:32:20 -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
Jim Miller
bef827572c am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
  Add isSafeModeEnabled() API to WindowManagerService
2012-11-08 15:32:09 -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