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

2068 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
5189fca3df Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD 2012-11-08 14:48:28 -08:00
Jean-Baptiste Queru
de8717c5f2 Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD 2012-11-08 14:44:44 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Winson Chung
40f8211e68 Preventing more than five widgets from being added in the carousel (issue 7502935) 
Change-Id: I26e6e154992e56b128d541578ffd3891776a3f7a
 2012-11-08 13:24:04 -08:00
Dianne Hackborn
a46a74fcd6 Merge "Remove extraneous logs." into jb-mr1-dev 2012-11-08 13:16:10 -08:00
Dianne Hackborn
7ff30113de Remove extraneous logs. 
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
 2012-11-08 13:13:48 -08:00
Daniel Sandler
9de5901bb3 Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev 2012-11-08 09:48:46 -08:00
Daniel Sandler
b499b1fa08 Don't crash if no ECA. 
(Phone landscape pattern lock, for example.)

Bug: 7502613
Change-Id: I3f48c4351ea04db2d8ad9a410166f60257f3d954
 2012-11-08 12:42:54 -05:00
Daniel Sandler
4eada64770 Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev 2012-11-08 09:28:14 -08:00
Daniel Sandler
6ed3fcafdb Only show the bouncer for the assistant if secure. 
We do this by using the helpful tools in
KeyguardActivityLauncher which do all the right callbacks
and stuff.

(This assumes the assist gesture is sufficiently hard to
false that we don't need the extra step of bouncing the
glowpad unlock affordance.)

Bug: 7500637
Change-Id: Id68cb85cdfd741f43a5bce69118ec4209125d785
 2012-11-08 12:13:17 -05:00
John Spurlock
14adfe425e Address comments from merged "Fix remaining jank in sec..." 
Cleanup based on post-merge comments on:
  I554ddffb7981488fa8a81933842b0c7730e775f3

Bug:7482560
Change-Id: I06b2bc91da9dfddd06db69efb9e7ad45c304f709
 2012-11-08 10:29:26 -05:00
Svetoslav Ganov
f3e03e234f am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit 'dc564945bb7382768e28e45c6fc2452e3f4d9da9':
  Make partially visible widget pages not important for accessibility.
 2012-11-08 06:14:37 -08:00
Sascha Prueter
f107bda0ad am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit 'a517fc3a393b075a677ef3052e22749951ede8fa':
  Use a consistent policy for filtering wake keys.
 2012-11-08 06:14:25 -08:00
Amith Yamasani
cb5cb740b5 am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'aecee8a98543118dacec14a94052243754560e9d':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:12:21 -08:00
John Spurlock
805337ab5f resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp 
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
 2012-11-08 07:43:15 -05:00
Michael Jurka
eb963f046d Enforce max number of 5 lockscreen widgets 
Change-Id: I7b7fca18174736c8f1aa0018f7399982c80b1cb0
 2012-11-08 02:06:38 -08:00
Adam Cohen
c8ed8d3260 Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev 2012-11-08 01:03:50 -08:00
Jim Miller
6be441c532 Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 2012-11-08 00:51:26 -08:00
Adam Cohen
08c83ef488 Adding user activity when the challenge is slid down 
Change-Id: I54a7dcf79718090dac6ec5991185712cc2abca37
 2012-11-08 00:45:49 -08:00
Jim Miller
4eeb4f664a Add mechanism to kick keyguard to show the assistant 
Fixes bug 7499778

Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
 2012-11-08 00:39:04 -08:00
Adam Powell
5dd8b00891 Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 2012-11-08 00:28:58 -08:00
Adam Powell
a9fa92e889 Keyguard - force showing the status bar 
Change-Id: I168293497a829346ba6f9566370c418ef1a09f8f
 2012-11-08 00:03:49 -08:00
Chris Wren
efbfa685b6 add bouncer frame to glowpad. 
Bug: 7497916
Change-Id: I6bddbfc91c89b0855eba0dcec46bc1b88684b8ad
 2012-11-07 23:29:17 -08:00
Jim Miller
2cacda5fc9 Disable interactive mode for full-screen security views in keyguard. 
Change-Id: Ied038ba96ba3a6e6f6b4bd25a4c5be74814596fe
 2012-11-07 23:20:02 -08:00
Adam Cohen
1e0f6faf5a Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev 2012-11-07 22:09:55 -08:00
Winson Chung
70c2f87364 Synchronizing bouncer duration with page scaling duration. 
Change-Id: I9fba381582a083ce2ab26375698c5a6f3d554a1b
 2012-11-07 21:48:06 -08:00
Adam Cohen
44dc141376 Clean up some flashy jank (issue 7454766) 
Change-Id: I809f3afbbb70e82847aa4851d20058a2c483a32e
 2012-11-07 21:39:56 -08:00
Adam Powell
e7e210cb43 Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 2012-11-07 21:06:31 -08:00
Winson Chung
2635750fa7 Adding workaround to fix issue where the bouncer animation had the wrong pivot. 
Change-Id: I500fb765cf206b97cc0b585c195cc647cc8e63f1
 2012-11-07 20:57:33 -08:00
Adam Powell
3fbbbb66b6 Fiddle with keyguard glowpad layouts 
Also add hierarchyviewer support for KeyguardSecurityView LayoutParams

Bug 7497272
Bug 7459668

Change-Id: I5d03751571d0af66f4c9d08a9d9ca476b32735ac
 2012-11-07 20:47:23 -08:00
Jim Miller
ae0161e7af Merge "Don't handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev 2012-11-07 19:52:08 -08:00
Adam Powell
d8e2fdf734 Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev 2012-11-07 18:31:46 -08:00
Adam Powell
eec4fe2cbe Use stable layouts for keyguard/SlidingChallengeLayout 
When coming back from the secure camera we will be transitioning from
fullscreen back to not-fullscreen with regard to the status bar. Flag
SlidingChallengeLayout to force the window to have stable insets so
that our layout doesn't jump around during this transition.

Set the same flag in MultiPaneChallengeLayout as well so that similar
cases with other activities are also covered.

Bug 7498950

Change-Id: I1b65e04d1404e764ddad29472b70cf791d6801f9
 2012-11-07 18:15:59 -08:00
Jim Miller
8bbafed48b Don't handle click events on the emergency button in bouncer mode 
This fixes a bug where the emergency call button was hidden, but not
gone.  This adds a call to setVisibility(INVISIBLE) when the alpha
is animated to 0 and restore it when bouncer mode is dismissed.

Fixes bug 7498389

Change-Id: I0898542ff7c666c8f41175a330b72d3450475739
 2012-11-07 18:10:49 -08:00
Daniel Sandler
5c533884ea Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev 2012-11-07 18:03:11 -08:00
Winson Chung
4181e8a4ac Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 2012-11-07 17:50:24 -08:00
Winson Chung
c065a5d727 Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984) 
- Laying out the drop target without padding from the multiuser picker

Change-Id: Icd3528a13f84a789341a841645bfde4e51fd1747
 2012-11-07 17:44:42 -08:00
Adam Cohen
85c4281aae Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 2012-11-07 17:08:31 -08:00
Jim Miller
5da893c93b Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev 2012-11-07 17:01:53 -08:00
Adam Cohen
d51700b3cc Fixing up overscroll asset / sizing 
-> No more jaggies! yay (issue 7459049)
-> Fixed up weird overscroll state (issue 7489094)

Change-Id: I5d6714a6f5f007ea0f73e4cf34a20572c5f43f64
 2012-11-07 16:54:35 -08:00
Jim Miller
f6ab5f9e3e Add one more check for detecting crashes while inflating multiuser widget 
Fix bug 7437751

Change-Id: I2e1d94458db9e56e049dae32f088b13a21803217
 2012-11-07 16:15:13 -08:00
Jim Miller
4096288022 Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 2012-11-07 16:05:46 -08:00
Jim Miller
edc74abf8a Implement fallback clock in keyguard 
This clock is shown if widgets are ever disabled by DPM and the
default clock package is not enabled.

Fixes bug 7469367

Change-Id: I8cf140c0fc00dd56265e3a332aff2fe3b41e3ec0
 2012-11-07 15:58:47 -08:00
John Spurlock
9a962d7c7d am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition. 
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
  Fix regression in camera transition.
 2012-11-07 15:06:45 -08:00
Michael Jurka
e4cc20d114 am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit '7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-07 15:06:41 -08:00
Jim Miller
d3bd6eb8b2 am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-07 15:06:33 -08:00
Michael Jurka
fd8c388f02 Merge "Fix bug where newly added widget wasn't always shown" into jb-mr1-lockscreen-dev 2012-11-07 15:02:08 -08:00