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

1691 Commits

Author SHA1 Message Date
Adam Cohen
1a77671114 am 6f02456e: am f2344e08: am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev 
* commit '6f02456e75e1aa1cc4cac593c3060a46761f0f31':
  Fading side pages as per mock
 2012-10-29 12:53:44 -07:00
Chris Wren
46566b30b6 am afa8b7ba: am a90f82fc: am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev 
* commit 'afa8b7ba41c131d1862d1a24a08c9ffcd162a47f':
  catch exceptional cases on factory-fresh devices.
 2012-10-29 12:53:40 -07:00
John Spurlock
9e1f1a8e84 am 8a109dba: am 8c480e4b: am 86b6357e: Manual f/b merge of lockhotness camera integration. 
* commit '8a109dba86857853b3351b3a7f41150629b494ad':
  Manual f/b merge of lockhotness camera integration.
 2012-10-29 12:52:42 -07:00
Jim Miller
aa557e5c25 am 0e0d6fba: am 412b6a5e: am 19a52670: Merge latest prototype changes into keyguard 
* commit '0e0d6fbab4d1f3e19718f251baab9f2da13e57d4':
  Merge latest prototype changes into keyguard
 2012-10-29 12:52:35 -07:00
Danielle Millett
7898fda7f4 am 1c41939d: am 5cba537a: am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev 
* commit '1c41939d8a1bb92d06d63d7c937d77539b61e290':
  Handling popups correctly for face unlock
 2012-10-29 12:52:11 -07:00
Adam Cohen
f2344e087c am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev 
* commit 'a9f166695b92e91ea6bb13a41f3aa1fb3f6ee77c':
  Fading side pages as per mock
 2012-10-29 12:46:16 -07:00
Chris Wren
a90f82fc10 am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev 
* commit 'ff8722574ee335453845c3dc04435a20dc94a99b':
  catch exceptional cases on factory-fresh devices.
 2012-10-29 12:46:13 -07:00
John Spurlock
8c480e4b1f am 86b6357e: Manual f/b merge of lockhotness camera integration. 
* commit '86b6357e5eb91950eac7de7ffe29e5a4ad32903b':
  Manual f/b merge of lockhotness camera integration.
 2012-10-29 12:45:17 -07:00
Jim Miller
412b6a5ef2 am 19a52670: Merge latest prototype changes into keyguard 
* commit '19a5267003e7dc70100a4bd4f1f449523b2ff38b':
  Merge latest prototype changes into keyguard
 2012-10-29 12:45:09 -07:00
Danielle Millett
5cba537ae1 am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev 
* commit '7c420ec69843c8efc95b4f36aa77f17d970d4eaf':
  Handling popups correctly for face unlock
 2012-10-29 12:44:46 -07:00
Jason Simmons
d45f2ae845 am e49b9c05: am df304ba0: resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev 
* commit 'e49b9c05c3774ab9409701788d4e00ced6292a4a':
  Integrate new PIN pad.
 2012-10-29 12:26:18 -07:00
Jason Simmons
df304ba0ba resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev 
Change-Id: Ic6d9435cf6c86a8048a99488d2e1dab49b4454c6
 2012-10-29 11:24:11 -07:00
Chris Wren
e5289a1120 am c5bb27d2: am 0882fe87: am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 
* commit 'c5bb27d246cdc2b66b20cf11e5521e6c1d1f7ac5':
  merge new multiuser avatars in from proto app
 2012-10-29 09:34:03 -07:00
Jim Miller
f6faa5312e am 7c7bf36e: am 8615a071: am 022554e3: Merge latest prototype changes into keyguard 
* commit '7c7bf36e48a73727f4ac255f908f78bcfea04507':
  Merge latest prototype changes into keyguard
 2012-10-29 09:26:47 -07:00
Jim Miller
3fd568999b am c5848971: am 17ac77c7: am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c584897164c79e5949f41377be9adeede0f36668':
  Wire up "add widget" in keyguard
 2012-10-29 09:26:43 -07:00
Jim Miller
e442b2bcdb am 1539a3d6: am ec141cd3: am 08697709: Fix multiple onScreenTurnedOn callbacks in KeyguardHostView. 
* commit '1539a3d67a901616ac5be5881da9f7fcb5cd2e3a':
  Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
 2012-10-29 09:26:28 -07:00
Chris Wren
0882fe87d4 am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 
* commit '3867ddabbe645749ba3d7db9fc0c0ab9ca84690b':
  merge new multiuser avatars in from proto app
 2012-10-29 09:25:16 -07:00
Jim Miller
8615a071c4 am 022554e3: Merge latest prototype changes into keyguard 
* commit '022554e3da6e496524387a5d3ecc67ef9749b587':
  Merge latest prototype changes into keyguard
 2012-10-29 09:16:41 -07:00
Jim Miller
17ac77c767 am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c28261d4fabf186cd5af5a563e6bab9023ee3758':
  Wire up "add widget" in keyguard
 2012-10-29 09:16:37 -07:00
Jim Miller
ec141cd382 am 08697709: Fix multiple onScreenTurnedOn callbacks in KeyguardHostView. 
* commit '086977094d96ab9352432e0941a05b09cefc92ac':
  Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
 2012-10-29 09:16:26 -07:00
Jim Miller
e14833c8e7 am 0f261b7e: am 52c55cd0: am d6523da1: Merge latest prototype changes into the framework 
* commit '0f261b7ea81efe85d64059826cdaeee6a585aeed':
  Merge latest prototype changes into the framework
 2012-10-26 18:20:03 -07:00
Jim Miller
325a0a0cf4 am bd5c198d: am 13056c98: am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev 
* commit 'bd5c198dd5e73c22447636b7faaf8951585b2d12':
  Get basic keyguard working in new branch
 2012-10-26 18:19:52 -07:00
Jim Miller
52c55cd0d0 am d6523da1: Merge latest prototype changes into the framework 
* commit 'd6523da1ad7bae805a3dbea8d7b398d86cd3c181':
  Merge latest prototype changes into the framework
 2012-10-26 15:24:28 -07:00
Jim Miller
13056c982a am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev 
* commit '28f1f5e6f9a9f4a8a5e82fcb58c8dfadca7b5f93':
  Get basic keyguard working in new branch
 2012-10-26 15:24:15 -07:00
Jeff Brown
74bea0665a Disable HDMI rotation lock. 
We used to lock the rotation to landscape when HDMI
was plugged in because we did not have a mechanism
for independently rotating secondary displays.
Now as part of the multi-display work we do have
a way to do this so we can turn off the special HDMI
rotation lock.

Bug: 7410631
Change-Id: I7948e92ebe6312a1e2eeeb91250259cd67a00fe0
 2012-10-25 16:22:22 -07:00
John Spurlock
3e98b9afe6 Revert part of fix for b/7377776 to fix b/7411356. 
This means the visual glitch is possible again, but reduced since
the layout transitions are disabled.

It's more important to bring back nav buttons for incoming calls
(for the secure, screen off case).

Bug: 7411356
Change-Id: I83005a77930ec7f70a613b3396f85ab1a5fdd96c
 2012-10-25 16:15:30 -04:00
Adam Cohen
a9f166695b Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev 2012-10-24 13:18:39 -07:00
Adam Cohen
6fb841fa21 Fading side pages as per mock 
-> Also, adding side pages hints when keyguard is inflated

Change-Id: I33f073ed97510a5982cddc4ee95f1ee3ed3c9397
 2012-10-24 13:15:38 -07:00
Chris Wren
28c5ee9ea9 catch exceptional cases on factory-fresh devices. 
Change-Id: I2019b4f31415efba72b5a3b5d659e41595e506f6
Proto-Id: I8a57f9f6f5b7339df3e243ecc51fb311f6ac8981
 2012-10-24 16:05:14 -04:00
John Spurlock
86b6357e5e Manual f/b merge of lockhotness camera integration. 
Change-Id: I5c7c3c49e13656e9ba4a3761be7d503642d5b76f
 2012-10-24 13:30:02 -04:00
Jim Miller
19a5267003 Merge latest prototype changes into keyguard 
Change-Id: Ibec6e9a7667ec730a25a58226c3203332af64b24
 2012-10-23 19:52:04 -07:00
Svetoslav Ganov
e1655c980d Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev 2012-10-23 17:35:24 -07:00
alanv
c2798a916e When A11y is on, use a longer interval between lockout announcements. 
Bug: 7384471
Change-Id: I72ac1fe7646588c9c7185cb0186f1e990b3a2f72
 2012-10-23 17:26:17 -07:00
Danielle Millett
7c420ec698 Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev 2012-10-23 15:42:22 -07:00
Danielle Millett
f6d0fc190c Handling popups correctly for face unlock 
Added a keyguardVisibilityChanged callback to indicate when the
keyguard is covered by something (alarm, phone, etc).  Face unlock
doesn't start if it's not visible and it restarts appropriately when
it gains visibility again.  This mostly fixes b/7362774 and b/7376783,
but there's some jank when face unlock goes away (if it was interrupted
while running).

Change-Id: I7bdf8ef6af687acaa7152d8e61bfdcc1979259ff
 2012-10-23 18:34:03 -04:00
Daniel Sandler
69bdee7c87 Integrate new PIN pad. 
Change-Id: I08d6551dfde501c5526eb6fd641ae08475c1365b
 2012-10-23 16:45:50 -04:00
Chris Wren
3867ddabbe Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 2012-10-23 12:29:05 -07:00
Chris Wren
692bb13352 merge new multiuser avatars in from proto app 
Change-Id: I6a7f63738279be1c036061b4cea461e94fb51658
 2012-10-23 13:48:38 -04:00
John Spurlock
31821c5b61 am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev 
* commit '780a13b0f43fa5590bb22dc399d9faaf316d66f5':
  Fix nav bar glitch when quickly turning screen off then on.
 2012-10-23 04:14:11 -07:00
Jim Miller
022554e3da Merge latest prototype changes into keyguard 
- multi-user avatar stuff.
- new SlidingChallengeLayout changes.

Change-Id: I45bec7313b71dbca16544e7525281bf6c0e44a25
 2012-10-22 19:06:05 -07:00
Jim Miller
c28261d4fa Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 2012-10-22 18:52:37 -07:00
Jim Miller
086977094d Fix multiple onScreenTurnedOn callbacks in KeyguardHostView. 
The show() method was calling onScreenTurnedOn() which attempted
to update the entire state.

Instead, show() should just ensure the current security screen
is showing.

This was causing some mischief in Face Unlock because onResume() was
being called multiple times.

Change-Id: I39682a213b1cc4dcf8133907b643028e844d0f47
 2012-10-22 16:50:50 -07:00
John Spurlock
1bbd49d72e Fix nav bar glitch when quickly turning screen off then on. 
Keyguard now disables all navbar buttons when turning screen off
instead of only recents.

Navbar is told about screen off/on and disables the layout transition
animation on screen off - if the user quickly turns the screen back
on they do not see the end of the fade out animation.

Bug:7377776
Change-Id: I96a050d58c6c9ce8537f50408655006fadbfcd4f
 2012-10-22 17:10:25 -04:00
Amith Yamasani
aad8cd4daa am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:34:29 -07:00
Amith Yamasani
cd75706117 System server should always send broadcasts to a specific or all users 
Bug: 7368245

Log a warning if the system process calls unqualified sendBroadcast()
and other calls.

As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.

Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
 2012-10-22 12:38:53 -07:00
Dianne Hackborn
a582c5081b am f584f111: Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev 
* commit 'f584f1112772fdffce13cba38995b9e28adca191':
  Fix issue #7353900: Brief flash of home screen while dream starts on lock screen.
 2012-10-22 10:32:19 -07:00
Jim Miller
b5f3b707a7 Wire up "add widget" in keyguard 
Change-Id: If10e91b4ed1289259f04e0dca91db4ce8645a0f7
 2012-10-21 19:09:23 -07:00
Jim Miller
d6523da1ad Merge latest prototype changes into the framework 
Specifically, this adds the following functionality:
- portrait layout on phones
- new KeyguardViewStateManager
- new SlidingChallengeLayout
- some event wiring.

Change-Id: Ie4491416f591b6d4002d33e9803a764a8ae730f6
 2012-10-21 17:45:09 -07:00
Jim Miller
838906b165 Get basic keyguard working in new branch 
This merges the changes from the proto app into the framework.
Basic functionality tested on phone in portrait:

- Slide
- Pattern
- PIN
- Password (wonky)
- SIM PIN

Change-Id: I21b2c30cf05dc01ffb20948f41a044e7af1db25f
 2012-10-19 18:42:56 -07:00
Dianne Hackborn
7ad4438414 Fix issue #7353900: Brief flash of home screen while dream starts on lock screen. 
Not very clean, this has a special hack in the window manager to
redo layout when a dream window is shown.  After MR1 we should clean
this up (and the various other special dream hacks).

Change-Id: Ic1a5a2b10a0a07b4a5dccdbf0736b614ec06dd4a
 2012-10-19 16:40:13 -07:00