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

1935 Commits

Author SHA1 Message Date
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
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
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
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
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92 
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
 2012-11-07 14:41:18 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Jim Miller
259e3121d3 am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '51117262c8fadb6d227d137e83ad66996b013141':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-07 11:14:14 -08:00
Adam Powell
de565f3bcb am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev 
* commit '7136544c06c2d10c7a1c6aa8715d2b717221aee8':
  Keyguard - MultiPaneChallengeLayout measurement/layout changes
 2012-11-07 11:14:04 -08:00
Chris Wren
888322a659 am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev 
* commit '5fcca70d280a789002f540ea04b9d7ae5d7fe324':
  animating challenge closed should close the challenge.
 2012-11-07 11:13:57 -08:00
Winson Chung
43ecd1912c am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions. 
* commit '6cf53bb3a94ec5a6eebc96a315dac32d042f1945':
  Using screen dimensions to calculate the expanded PagedView dimensions.
 2012-11-07 11:13:52 -08:00
Danielle Millett
2f4be247b6 am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev 
* commit '2d9fae2bcfbc8021873a39b3935644e9b9fb5af2':
  Removing callbacks in onDetachedFromWindow, fixes b/7465673
 2012-11-07 11:13:43 -08:00
Adam Cohen
441d3401bf am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev 
* commit '7741e6209ab4c6425ee4156631f54fe9bfce5fc3':
  Making sure the sticky widget logic works with music
 2012-11-07 11:13:37 -08:00
Chris Wren
950f947cea am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev 
* commit '9f79d0db09818e94b6c2089f952d1ef42e1e1fae':
  make challengeShowing sticky across bounce.
 2012-11-07 11:13:27 -08:00
Chris Wren
98f95b3af1 am f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev 
* commit 'f7e47a003ada4b225dcafe722ab0de35a846b58a':
  specify start value: Drawables don't have getAlpha(). also, some clean up.
 2012-11-07 11:13:24 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Chris Wren
cf9ee4c55d Merge "Don't pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 2012-11-07 09:12:32 -08:00
Chris Wren
a042ac9064 Don't pop the IME for passwors at ScreenOn on tablets. 
Change-Id: I4c157559b2a70021d55211607c1d62ba73adc590
 2012-11-07 11:53:41 -05:00
John Spurlock
34c4fe523a Fix remaining jank in secure add-widget transition. 
Wait for activity to launch before dismissing the keyguard.
Otherwise we see launcher/last activity waiting for the
picker to start up.

Also remove camera transition workaround obviated by:
  Iefee62061962625b622ff2cf9a307d9429c2ad54

Bug:7482560
Change-Id: I554ddffb7981488fa8a81933842b0c7730e775f3
 2012-11-07 10:22:06 -05:00
Michael Jurka
cabcc59007 Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 2012-11-07 01:16:11 -08:00
Michael Jurka
192d6d4ee2 Allowing rotation while adding lockscreen widgets 
Also cleaning up some unused code

Bug: 7468012
 2012-11-07 01:12:26 -08:00
Adam Powell
9799714f6c Keyguard layout tweaking/reworking 
Teach KeyguardSecurityViewFlipper about layout_maxWidth/Height. Give
maxes to security views. Fix some IME layout weirdness in
SlidingChallengeLayout by adding more weirdness.

Change-Id: I8047d32302aad44844de06d54b150586b0861dab
 2012-11-06 23:00:30 -08:00
Jim Miller
9d0d796f47 Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev 2012-11-06 19:05:43 -08:00
Adam Cohen
42164efac3 Merge "Ensuring bindAppWidget isn't called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev 2012-11-06 19:04:55 -08:00
Adam Cohen
efb3ffb029 Ensuring bindAppWidget isn't called until boot completed (issue 7469267) 
Change-Id: I997f5a191116db7c840bf4a947385958b57cd657
 2012-11-06 19:03:29 -08:00
Michael Jurka
835579e817 Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 2012-11-06 19:01:51 -08:00
Michael Jurka
76017cad4f Removing sticky widgets in lockscreen 
Also adding mechanism to show a widget after
adding it

Change-Id: Ic4d49e6ef1343c38fa731b0ed2a327c55b678abf
 2012-11-06 18:56:41 -08:00
Jim Miller
0928e019ce Fix emergency call area updates. 
This fixes a bug where the emergency call button doesn't reflect the current
state.

Fixes bug 7482869

Change-Id: I7de2100f10a078943cb92c13d638c72e99c7a643
 2012-11-06 18:43:22 -08:00