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

2337 Commits

Author SHA1 Message Date
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
0b435ae59e am 9a962d7c: am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition. 
* commit '9a962d7c7df9ff762e3d9798cde868ad73b164db':
  Fix regression in camera transition.
 2012-11-07 15:10:20 -08:00
Michael Jurka
eebf218ad4 am e4cc20d1: am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit 'e4cc20d1148addab9f6f27bad70b3f6d437ea06c':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-07 15:10:16 -08:00
Jim Miller
91cc386e55 am d3bd6eb8: am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit 'd3bd6eb8b2f348c19fbbe79a11c0dc9aa5f27637':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-07 15:10:08 -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
Jean-Baptiste Queru
f5a79d313e am 476fceab: Merge 5418dd92 
* commit '476fceaba3e8c8d5b775fc07ad098792fc757f76':
  Adding bouncer animation on PagedView. (Bug 7459660)
 2012-11-07 14:54:34 -08:00
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92 
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
 2012-11-07 14:41:18 -08:00
Michael Jurka
1413889565 Fix bug where newly added widget wasn't always shown 
Bug: 7491900

Change-Id: I878eea745ee6127b757aa945631c1a4eb08d9936
 2012-11-07 14:22:26 -08:00
Adam Powell
c717d110ae Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev 2012-11-07 14:14:24 -08:00
Adam Powell
eeb6255056 Fix keyguard measurement bugs 
Bug 7493748
Bug 7493764

Change-Id: I2182ec4347eefc80198e675684bc5d195f947763
 2012-11-07 14:07:46 -08:00
Chris Wren
8e3bf41d8b Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 2012-11-07 13:49:03 -08:00
Chris Wren
d2dec00a0a add logging to enableUserSelectorIfNecessary. 
Bug: 7437751
Change-Id: I4a223ac68f780dac212ee5ed0729d59278fd1e4b
 2012-11-07 16:38:33 -05:00
Daniel Sandler
1ce804397f Make dismissKeyguardLw use KeyguardViewMediator.dismiss(). 
It previously did some of the logic of dismiss() itself:
checking to see if the KG is secure, and if not, proceeding
to call keyguardDone() to actually hide everything. But now
that we have the "bouncer" authentication UI, the WM should
let the keyguard challenge the user to see if even a secure
keyguard should be dismissed. (Insecure keyguards should
behave exactly has they did before.)

Unless, of course, the KVM is in a "dismissable" state, in
which case it's safe to call keyguardDone() directly. (This
can happen if the user has *already* authenticated and we're
ending up in this codepath in response.)

Bug: 7458531
Change-Id: I9571acf19f9bcc16bba7a826f916da7be8ca9c33
 2012-11-07 16:38:21 -05:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
 2012-11-07 13:08:25 -08:00
Chris Wren
b524f4b928 Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 2012-11-07 12:39:54 -08:00
Chris Wren
91f080c777 add some defensive code to enableUserSelectorIfNecessary. 
Bug: 7437751
Change-Id: I3f8e317624f158fce0d58be69b733699a208d802
 2012-11-07 15:21:37 -05: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
Adam Cohen
8f837a690b Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 2012-11-07 11:51:06 -08:00
Adam Cohen
4eb36cfdca Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235) 
Change-Id: I736816dac8cea47632fbdbc75b367f2c6216dff7
 2012-11-07 11:45:30 -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