Jeff Brown
ae8de95cf2
am ba16031a: am 409c89c3: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
...
* commit 'ba16031aa15713ea2ed979d40be02b7ca99d4990':
2012-10-31 20:35:46 -07:00
Raph Levien
65a33ecd50
am 19d7cc38: am 688d0381: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
...
* commit '19d7cc3814c59fcedb7d181c3fb17b3e8bb4ed00':
2012-10-31 20:35:42 -07:00
Baligh Uddin
011ab04ec2
am 28ce2ed9: am 4bce83ee: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '28ce2ed9ba8148626cecfec5b6501847f5c1e3e0':
2012-10-31 20:35:39 -07:00
Baligh Uddin
11b7ec201d
am 7960244c: am 13d02d04: am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '7960244c499049e231043e760452f32070ae8493':
2012-10-31 20:35:36 -07:00
Baligh Uddin
277f8639b9
am 7a767180: am 47f52d75: am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7a7671807c9d0ffafb4a70335d9adfc81b723ed6':
2012-10-31 20:35:31 -07:00
Baligh Uddin
13392856be
am f97b62bd: am 6697c682: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit 'f97b62bd18094b69f120341ae1dd98df8d0d23f7':
2012-10-31 20:35:27 -07:00
Svetoslav Ganov
b544746365
am 0c777537: am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
...
* commit '0c77753749bf0372a3876ba5f8a45d497208614c':
Fix keypad accessibility.
2012-10-31 20:35:24 -07:00
Baligh Uddin
87cae3993a
am 22815f1d: am 0e06223c: am 6bd881bd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '22815f1df619a0cfee3b7483ade51121fa36c8d6':
2012-10-31 20:35:20 -07:00
Svetoslav Ganov
6525efafa9
am 708d8db9: am 51cfc540: Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev
...
* commit '708d8db946e048527a56a23accfaa2e94333ca5c':
Accessibility of the lock screen - strings
2012-10-31 20:35:17 -07:00
Amith Yamasani
5c8c2ac3b0
am 53bcda4f: am 7f5bade1: am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
...
* commit '53bcda4f57135e7ed0f40ce82e359020c92660d5':
2012-10-31 20:35:13 -07:00
Jim Miller
ea6c15ef50
am 57dcf248: am 170c8d93: Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev
...
* commit '57dcf248d61dfc72f7b4519dd1cbb02bf8f342f5':
Remove extra KeyguardViewStateManager construction
2012-10-31 20:35:10 -07:00
Chris Wren
594a1918ef
am 5bbf7ef8: am f778bfdf: Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev
...
* commit '5bbf7ef83d7c7c99ed020bf25c745c242f14785f':
Update bouncer behavior on tablets.
2012-10-31 20:35:06 -07:00
Baligh Uddin
17e08407f8
am 971c086e: (-s ours) am 5b039844: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev
...
* commit '971c086ea5e133f875b1656d2de3b5f028b4614f':
Revert "Import translations. DO NOT MERGE"
2012-10-31 20:35:05 -07:00
Baligh Uddin
3bf92392ec
am 244c3edc: (-s ours) am f6afd134: am e8b0c0e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '244c3edc6898f9b1798e3e0141443ce4b399dd7b':
Import translations. DO NOT MERGE
2012-10-31 20:34:58 -07:00
Baligh Uddin
44db056233
am 367f3e78: (-s ours) am bdb64499: (-s ours) am 02dfd644: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '367f3e78b62508152f0acc7d87f10c8eeff69576':
Import translations. DO NOT MERGE
2012-10-31 20:34:53 -07:00
Baligh Uddin
244c3edc68
am f6afd134: am e8b0c0e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'f6afd1347665af463d536fa1626b03bef219bffe':
Import translations. DO NOT MERGE
2012-10-31 20:32:10 -07:00
Baligh Uddin
367f3e78b6
am bdb64499: (-s ours) am 02dfd644: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'bdb644994d7d4b04d19849f892f03eb304cd4562':
Import translations. DO NOT MERGE
2012-10-31 20:32:09 -07:00
Romain Guy
3d1728c03a
A new clock widget to create lock screen appwidgets
...
This new widget replaces DigitalClock. It listens to all the correct
system events and offer the ability to customize the formatting
patterns in 12-hour and 24-hour modes. It also supports fixed
time zones to create world clocks.
One more step towards becoming ClockOS!
Change-Id: I677e5dfca8cd8c8d1f8c49e54d7507f4d1885bf4
2012-10-31 20:31:58 -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
Dave Burke
3e86f5432e
am b85b9e48: am 1460a378: am 1b33342b: am 86e1b966: Fix ordering bug
...
* commit 'b85b9e481cbb7361a9f39c07600522ff8e534992':
2012-10-31 19:45:31 -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
Michael Jurka
24e9f3448a
am 1ba20a67: am 7b1deee1: am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
...
* commit '1ba20a670dec03998d50290de06dc18828df5b6c':
Fix crash on boot
2012-10-31 19:45:23 -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
f66d2593c9
am 412a92cf: am acb544dd: am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
...
* commit '412a92cfe28e74602bd2e9f0af378118a619aad8':
Lockscreen accessibility - strings.
2012-10-31 19:45:11 -07:00
Svetoslav Ganov
5b522e3d0b
am 3f909ed0: am 253cbc43: am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
...
* commit '3f909ed0e1ba134fe8c8ca15b0cae0115f9348f7':
2012-10-31 19:45:08 -07:00
Ed Heyl
44ee9ad79e
am 770cf002: am aa5f5a22: am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
...
* commit '770cf0023ed67ddb53af95dec0c79b8b8fb8b809':
2012-10-31 19:45:04 -07:00
Amith Yamasani
ef8390bfe5
am 1f3d76bd: am 1fa4fc55: am d2f616f2: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
...
* commit '1f3d76bdaa2ebea5e7c91cb331e8a3600e841422':
2012-10-31 19:45:00 -07:00
Amith Yamasani
76b27e915a
am 87ef92bf: am d505aa90: am 7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
...
* commit '87ef92bf9380b0c9fb5f373459ea206db5e47ebb':
QS uses nickname for multiuser and profile name for singleuser.
2012-10-31 19:44:55 -07:00
Dave Burke
b85b9e481c
am 1460a378: am 1b33342b: am 86e1b966: Fix ordering bug
...
* commit '1460a378246d88924d9ebd0bc27840ba40d4f536':
2012-10-31 19:42:00 -07:00
Adam Powell
055f001f76
am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
...
* commit '45d2f164877a8bfd4e99666b00d56169b23ff979':
Fix keyguard bugs
2012-10-31 19:41:55 -07:00
Michael Jurka
1ba20a670d
am 7b1deee1: am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
...
* commit '7b1deee1554ca8f4a4d6d79091eea7358a1b3bce':
Fix crash on boot
2012-10-31 19:41:51 -07:00
Jim Miller
0b063f3103
am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
...
* commit '2bf287c884f18e0f5c18c738d2d9b42d34323857':
Re-enable transition animation between face unlock and backup
2012-10-31 19:41:46 -07:00
Jim Miller
99e8692ace
am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
...
* commit 'c3ab855a35bafcf3138316fc8d20c2a3933d40f5':
Fix potential null pointer exeption in keyguard
2012-10-31 19:41:40 -07:00
Svetoslav Ganov
412a92cfe2
am acb544dd: am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
...
* commit 'acb544dda8861b7da84c8c078d87a7a713f363a8':
Lockscreen accessibility - strings.
2012-10-31 19:41:36 -07:00
Svetoslav Ganov
3f909ed0e1
am 253cbc43: am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
...
* commit '253cbc43323ff52fdb731d4867b4886207d5a655':
2012-10-31 19:41:32 -07:00
Ed Heyl
770cf0023e
am aa5f5a22: am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
...
* commit 'aa5f5a22754db00be8b7d4fd7fb9c36a5ad393ed':
2012-10-31 19:41:30 -07:00
Amith Yamasani
1f3d76bdaa
am 1fa4fc55: am d2f616f2: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
...
* commit '1fa4fc558173d2491b06eed272c8cc848d575109':
2012-10-31 19:41:26 -07:00
Amith Yamasani
87ef92bf93
am d505aa90: am 7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
...
* commit 'd505aa908812a8e05b12ceee63ccdf7f0957fbf9':
QS uses nickname for multiuser and profile name for singleuser.
2012-10-31 19:41:24 -07:00
Michael Jurka
40d90211fe
am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
...
* commit 'c8dc8eb3275a6d05e27824f322796e97e5e50e2f':
Use new keyguard appwidget picker
2012-10-31 19:37:43 -07:00
Adam Powell
302b6819cd
am 077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
...
* commit '077105bae304d92c61ec5d164549eb028d4b283b':
Fix some drag behavior bugs in keyguard
2012-10-31 19:37:39 -07:00
Chet Haase
437e1a9c5b
am 4f721f10: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
...
* commit '4f721f101dafb4d756471fa99b3e796f11c2b38e':
2012-10-31 19:37:35 -07:00
Jeff Brown
ba16031aa1
am 409c89c3: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
...
* commit '409c89c35838a0a5402abb253dc24ea959db6c5e':
2012-10-31 19:37:32 -07:00
Raph Levien
19d7cc3814
am 688d0381: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
...
* commit '688d038173a40f68ec2d06183978e4aaddbb9806':
2012-10-31 19:37:28 -07:00
Baligh Uddin
28ce2ed9ba
am 4bce83ee: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '4bce83ee052b21df275822d11b07fb1fdf214cc9':
2012-10-31 19:37:24 -07:00
Baligh Uddin
7960244c49
am 13d02d04: am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '13d02d042737dd13d858151d1e28090e90ebb4a2':
2012-10-31 19:37:21 -07:00
Baligh Uddin
7a7671807c
am 47f52d75: am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '47f52d754a738d0231312bafe8eaa0da8d0b3cde':
2012-10-31 19:37:17 -07:00
Baligh Uddin
f97b62bd18
am 6697c682: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit '6697c682faf1d1b6eb2cde289ff4ac42eac04665':
2012-10-31 19:37:14 -07:00