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

87846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
c70379347e am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 
* commit 'cabcc5900790daaa9ca4d080848c9b505c3de126':
  Allowing rotation while adding lockscreen widgets
 2012-11-07 11:14:45 -08:00
Adam Cohen
96c3f7e5f2 am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 
* commit '1361758f90e3c247e2da953913ef424041d1c847':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
 2012-11-07 11:14:41 -08:00
Adam Powell
3c0a353a05 am 9799714f: Keyguard layout tweaking/reworking 
* commit '9799714f6c69efe50e21a6073b879140e5e792b7':
  Keyguard layout tweaking/reworking
 2012-11-07 11:14:38 -08:00
Daniel Sandler
f74cac4699 am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit '9edc48e26354f6a7282e68851a6d9ba734c7ceb1':
  Updated assets.
 2012-11-07 11:14:34 -08:00
Jim Miller
52bf955e3e am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev 
* commit '9d0d796f47524da7abe018ca6ad892b819a0e66f':
  Fix emergency call area updates.
 2012-11-07 11:14:31 -08:00
Adam Cohen
16a3f4c9f9 am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev 
* commit '42164efac3f4422e66d176de24e1a0857cacabab':
  Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
 2012-11-07 11:14:28 -08:00
Michael Jurka
1aad5be916 am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 
* commit '835579e8173700be78368827d5c042ac4f698e29':
  Removing sticky widgets in lockscreen
 2012-11-07 11:14:24 -08:00
Svetoslav Ganov
1cbb449c0c am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit 'ad9f594e1ca36d4b847ec14e9ccf6e2d40bbc388':
 2012-11-07 11:14:21 -08:00
Sascha Prueter
6285533207 am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit 'bc69698c8f1fdf7abc9ffb0225e47633617f5628':
 2012-11-07 11:14:17 -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
Romain Guy
96f6491aa7 am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '475255bffc792b48e18213a6bfde0fc9ebeb4a34':
 2012-11-07 11:14:11 -08:00
Eino-Ville Talvala
f83ace0b4b am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '688d98fe2185774322aa87dffd656fad471823ef':
 2012-11-07 11:14:07 -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
Victoria Lease
b000c36207 am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '8d803258ca1550583d03c1a24c5c6d4b38535ba8':
 2012-11-07 11:14:01 -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
Jim Miller
fe7e94a094 am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:13:48 -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
Adam Cohen
a7af02098a am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
  Attempted fix for issue 7469415
 2012-11-07 11:13:34 -08:00
Amith Yamasani
22559dc5bf am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit '5eac4d852bdc62964acd1c8805b6e9cd8301f262':
 2012-11-07 11:13:31 -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
The Android Open Source Project
a8540f2ae3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I3d0120226503d1aa5538039f17811e01131d99c8
 2012-11-07 10:19:51 -08:00
Roman Nurik
a93f94d32c am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit '512950a9713f79f2900c73201906436d12da8639':
  docs: Minor Nexus 10 fix in Device Art Generator
 2012-11-07 09:52:36 -08:00
Roman Nurik
512950a971 Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 2012-11-07 09:49:37 -08: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 Cohen
1361758f90 Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 2012-11-06 23:31:49 -08:00
Adam Cohen
e41dd0f195 Giving glow pad the brains to scale itself dynamically (issue 7449554) 
Change-Id: I44f31d354171c01b607871d6a9e1e9d06a49ffc8
 2012-11-06 23:06:44 -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
Daniel Sandler
9edc48e263 Merge "Updated assets." into jb-mr1-lockscreen-dev 2012-11-06 21:14:13 -08:00
Daniel Sandler
fa61fc8532 Updated assets. 
Change-Id: I4daaddb01c6156bdfacc5400886a6d7fc61d3ac0
 2012-11-07 00:04:50 -05: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
The Android Automerger
80d1781731 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:04:04 -08:00
Svetoslav Ganov
7ccb280611 am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit '5fff5f01f8af05164d5d7be72bdadee46360ba92':
  Make partially visible widget pages not important for accessibility.
 2012-11-06 17:49:15 -08:00
Svetoslav Ganov
ad9f594e1c am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit '5fff5f01f8af05164d5d7be72bdadee46360ba92':
  Make partially visible widget pages not important for accessibility.
 2012-11-06 17:49:02 -08:00
Svetoslav Ganov
5fff5f01f8 Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 2012-11-06 17:46:44 -08:00
Irfan Sheriff
567a2919f3 Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 2012-11-06 17:39:46 -08:00
Sascha Prueter
ee8fab8be5 am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit '872965bb22ba74a06b755547883c5d0de62bb956':
  Use a consistent policy for filtering wake keys.
 2012-11-06 17:14:59 -08:00
Sascha Prueter
bc69698c8f am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit '872965bb22ba74a06b755547883c5d0de62bb956':
  Use a consistent policy for filtering wake keys.
 2012-11-06 17:14:35 -08:00
Sascha Prueter
872965bb22 Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 2012-11-06 17:11:26 -08:00
Jim Miller
51117262c8 Handle DevicePolicyManagement and safe mode when inflating widgets 
Bug 7459120
Bug 7444159
Bug 7444016

Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
 2012-11-06 17:04:26 -08:00
Jeff Brown
1c2e4948a1 Use a consistent policy for filtering wake keys. 
Previously wake keys were filtered differently depending on whether
a keyguard was showing.  If the user disables the keyguard then
no filtering was applied, which means that the volume key may
wake your device while in your pocket.

This change ensures that we use the same policy consistently
regardless of whether keyguard is showing.  The behavior is
otherwise the same.

Removed the "Locked" suffix on a method that was actually
being called without a lock held and which in fact does not
require it.

Bug: 7481025
Change-Id: I704c71ca009bc5437f349f858b9de7c77ea73e4b
 2012-11-06 16:48:15 -08:00
Romain Guy
7b9b41c18d am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:18:23 -08:00