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

2297 Commits

Author SHA1 Message Date
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
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
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
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 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
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
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
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
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
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
Adam Cohen
4d6d5f185c am e5785461: am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev 
* commit 'e5785461b753f68258c9609754f158f3dbf5fb26':
  Making sure the sticky widget logic works with music
 2012-11-08 15:32:01 -08:00
Chris Wren
abbf79c6f5 am 66425daf: am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev 
* commit '66425daffc4442693a0dddb6323362877507cc28':
  make challengeShowing sticky across bounce.
 2012-11-08 15:31:42 -08:00
Jean-Baptiste Queru
7c8d2b63c0 Merge from jb-mr1-dev-plus-aosp 
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
 2012-11-08 15:19:11 -08:00
Adam Cohen
c276e82dd0 Deferring size callbacks until boot completed (issue 7469267) 
-> Also bumping priority of the boot completed receiver

Change-Id: I7b68a29b4a8c927713bfbc1f4585f96ce0c47f35
 2012-11-08 14:56:36 -08:00
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
a083599a75 am f3e03e23: am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit 'f3e03e234f47a85ba25d7a0038253951e94df3b8':
  Make partially visible widget pages not important for accessibility.
 2012-11-08 06:18:51 -08:00
Sascha Prueter
06a5aaa8f8 am f107bda0: am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit 'f107bda0ad3c16dfc85cd2119445e63a937be6bd':
  Use a consistent policy for filtering wake keys.
 2012-11-08 06:18:43 -08:00
Amith Yamasani
cb2f707f86 am cb5cb740: am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'cb5cb740b587744150df7414bdc2974144e9167a':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:17:59 -08: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
426b050c43 am 805337ab: resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp 
* commit '805337ab5fb2adf108726b351319d77007577bb4':
  Remove add widget transition jank (insecure).
 2012-11-08 05:58:09 -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