drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,792 Commits 1 Branch 0 Tags
Commit Graph

94792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Baligh Uddin
22815f1df6 am 0e06223c: am 6bd881bd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '0e06223ca39f12939283e68a8d7a9d8f0d33cd8c':
 2012-10-31 19:37:07 -07:00
Svetoslav Ganov
708d8db946 am 51cfc540: Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev 
* commit '51cfc540b578e1e6389471b28c9787ae50910655':
  Accessibility of the lock screen - strings
 2012-10-31 19:37:03 -07:00
Amith Yamasani
53bcda4f57 am 7f5bade1: am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev 
* commit '7f5bade1110bc45cebaf49b4e5426c8459c0666a':
 2012-10-31 19:37:00 -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
Baligh Uddin
971c086ea5 am 5b039844: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev 
* commit '5b0398448b367f36883dd6c9ea16ced781c72d10':
  Revert "Import translations. DO NOT MERGE"
 2012-10-31 19:36:41 -07:00
Baligh Uddin
f6afd13476 am e8b0c0e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'e8b0c0e702cd962bd670450ee1c56e79a5cf8a51':
  Import translations. DO NOT MERGE
 2012-10-31 19:36:37 -07:00
Baligh Uddin
bdb644994d am 02dfd644: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '02dfd644c9e0c48ecd3a3eba16cee39045fbc875':
  Import translations. DO NOT MERGE
 2012-10-31 19:36:33 -07:00
Dave Burke
1460a37824 am 1b33342b: am 86e1b966: Fix ordering bug 
* commit '1b33342b0099f285e7465cd7947d55d1c09c7e37':
 2012-10-31 19:36:30 -07:00
Jeff Brown
074b8b7cf1 Eliminate potential reentrance from unregisterInputChannel. 
Ensure that all callbacks into the window manager policy occur
on the input dispatcher thread in the right place.  This fixes
a potential deadlock that may occur if the window manager
unregisters an input channel while holding its own lock.

The change is simply to defer running asynchronous commands
(usually callbacks into the policy) until the next iteration
of the dispatch looper thread.

Bug: 7382388
Change-Id: I90095580d717fcddb2209ef332df56400f837a34
 2012-10-31 19:01:31 -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
Michael Jurka
7b1deee155 am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev 
* commit '3c416dfcc0a4692b20a09f188284d9127dd5dbca':
  Fix crash on boot
 2012-10-31 18:38:03 -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
acb544dda8 am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev 
* commit '8ea7cbe6f338b3dad2817eeca437221eede4298f':
  Lockscreen accessibility - strings.
 2012-10-31 18:37:51 -07:00
Svetoslav Ganov
253cbc4332 am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev 
* commit '4a85b9f36cb180453298eec7f4a55de37586907b':
 2012-10-31 18:37:47 -07:00
Ed Heyl
aa5f5a2275 am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev 
* commit '1f928787eebefedef944708f99515fabfcc4a201':
 2012-10-31 18:37:44 -07:00