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

85382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
b068af61ca am 369bb97d: Merge "P2p API for WFD" into jb-mr1-dev 
* commit '369bb97d02209fa800081fc3b4e8675ea7e75d34':
  P2p API for WFD
 2012-09-06 09:56:54 -07:00
Irfan Sheriff
369bb97d02 Merge "P2p API for WFD" into jb-mr1-dev 2012-09-06 09:54:28 -07:00
Jean-Baptiste Queru
b57ede6a59 am c89cb7cd: am c67fb6c3: am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'c89cb7cde2ad3d3aa51600a3d55e68b3dfeb40c2':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:23:52 -07:00
Jean-Baptiste Queru
c89cb7cde2 am c67fb6c3: am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'c67fb6c39e75a08e50977e143d7ae7bd11e2604c':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:20:57 -07:00
The Android Open Source Project
9f828e109a am 73839a69: (-s ours) am 7a647522: am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '73839a69ab34f0817e18b1c3cc9f24adf1618bf0':
  Revert "Update Back softkey icon Bug: 6020915"
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
  DO NOT MERGE Remove dead code
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
  DO NOT MERGE - New implementation for ScaleGestureDetector
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-09-06 09:19:48 -07:00
Jean-Baptiste Queru
c67fb6c39e am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:18:20 -07:00
The Android Open Source Project
73839a69ab am 7a647522: am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '7a6475220dbba9679fc15ef3fa92cd4f9f064615':
  Revert "Update Back softkey icon Bug: 6020915"
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
  DO NOT MERGE Remove dead code
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
  DO NOT MERGE - New implementation for ScaleGestureDetector
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-09-06 09:18:00 -07:00
Martijn Coenen
a7e34d5178 am 67ad3e98: am 32ac1e14: Fix NPE in NdefRecord parser. 
* commit '67ad3e98e373402cb6be5cdc8036a82eb8f7be91':
  Fix NPE in NdefRecord parser.
 2012-09-06 09:16:43 -07:00
Michael Jurka
1f8f4a191b am 03f9eaf9: am 4848f42f: Merge "Fixing issue where recents items would go dim" into jb-mr1-dev 
* commit '03f9eaf9b9cead5df785c39b7edfc9c44bfbb424':
  Fixing issue where recents items would go dim
 2012-09-06 09:16:39 -07:00
Jean-Baptiste Queru
657dba9e66 am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit '4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:16:09 -07:00
The Android Open Source Project
7a6475220d am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '1d9c5d8f18b7530c1e72fe86109707cddc198dbd':
  Revert "Update Back softkey icon Bug: 6020915"
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
  DO NOT MERGE Remove dead code
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
  DO NOT MERGE - New implementation for ScaleGestureDetector
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-09-06 09:13:45 -07:00
Martijn Coenen
67ad3e98e3 am 32ac1e14: Fix NPE in NdefRecord parser. 
* commit '32ac1e142c4a0f3529c49cde433ae5e22f84b1d6':
  Fix NPE in NdefRecord parser.
 2012-09-06 09:13:43 -07:00
Michael Jurka
03f9eaf9b9 am 4848f42f: Merge "Fixing issue where recents items would go dim" into jb-mr1-dev 
* commit '4848f42f65082340b98da2628761e59567d19d9d':
  Fixing issue where recents items would go dim
 2012-09-06 09:13:39 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:12:17 -07:00
Andreas Huber
ab4cd45133 P2p API for WFD 
Change-Id: I3914a515313654f7032d8bb102afebf0ed776783
 2012-09-06 09:06:13 -07:00
Daniel Sandler
32f6fd55b1 New "Start dreams" launcher shortcut. 
Change-Id: Ice46fc8b99dae615e421ccf4eb6ca6f2a76cbe5f
 2012-09-06 11:52:10 -04:00
Martijn Coenen
32ac1e142c Fix NPE in NdefRecord parser. 
Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5
 2012-09-06 17:13:38 +02:00
The Android Open Source Project
1d9c5d8f18 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: I3ba16c8a37fd836c6c74dcfd1793f8bc1282b746
 2012-09-06 08:08:54 -07:00
Jean-Baptiste Queru
bb60bc2602 Merge "Musicplayer application can not display DRM files of internal storage." 2012-09-06 07:21:00 -07:00
Michael Jurka
4848f42f65 Merge "Fixing issue where recents items would go dim" into jb-mr1-dev 2012-09-06 01:13:59 -07:00
Craig Mautner
69b0818179 Limit certain actions to default Display. 
Stop messing up PhoneWindowManager state when passing in windows
from non-default Display.

Change-Id: I472f7a13c5e2241fbf1f79ae1c8045fd92af016c
 2012-09-05 19:54:32 -07:00
Jim Miller
d48d23d346 am e2c68c10: am 5830cb28: Cosmetic code changes to face unlock after review. 
* commit 'e2c68c10a7d6d0a807ece078674887add3aeea9d':
  Cosmetic code changes to face unlock after review.
 2012-09-05 18:59:36 -07:00
Jim Miller
e2c68c10a7 am 5830cb28: Cosmetic code changes to face unlock after review. 
* commit '5830cb2882b38182f414423ae1bc901cc27767cc':
  Cosmetic code changes to face unlock after review.
 2012-09-05 18:57:56 -07:00
Jim Miller
5830cb2882 Cosmetic code changes to face unlock after review. 
Change-Id: I6e4face14c1585ed7123ae9c055b5ac3ccc86395
 2012-09-05 18:54:18 -07:00
Jim Miller
1e16e3d173 am d6778063: am d2d4a645: Merge "Keep local reference to KeyguardStatusViewManager so it doesn\'t get GC\'d" into jb-mr1-dev 
* commit 'd67780634e183e6d9dea4acb306b84282c0f167c':
  Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd
 2012-09-05 18:30:58 -07:00
Jim Miller
d67780634e am d2d4a645: Merge "Keep local reference to KeyguardStatusViewManager so it doesn\'t get GC\'d" into jb-mr1-dev 
* commit 'd2d4a6456579ea460afb6baf3a4e7cb2a27d55fb':
  Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd
 2012-09-05 18:28:13 -07:00
Jim Miller
d2d4a64565 Merge "Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd" into jb-mr1-dev 2012-09-05 18:25:43 -07:00
Jim Miller
6212cc0d3f Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd 
This fixes a bug where we'd stop updating the status view in keyguard
because KeyguardStatusViewManager had no references.

It also fixes a bug where KeyguardUpdateMonitor wasn't removing objects
because objects were being compared with WeakReferences rather than the
content of the WeakReferences.

Bug:7095359

Change-Id: I2d9df6097b2270655ad3662bcf7a6757e0515363
 2012-09-05 18:14:29 -07:00
Jim Miller
b55bc2c9ff am dab6deb6: am e7376e2c: Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev 
* commit 'dab6deb6f428da93194642e65ce27c879f09ac5f':
  Initial pass at re-enabling face unlock in new keyguard.
 2012-09-05 16:58:55 -07:00
Jim Miller
dab6deb6f4 am e7376e2c: Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev 
* commit 'e7376e2c2c4358c18578aefe861cf06573e2575d':
  Initial pass at re-enabling face unlock in new keyguard.
 2012-09-05 16:56:05 -07:00
Jim Miller
e7376e2c2c Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev 2012-09-05 16:53:12 -07:00
Chris Craik
6ebdc114e0 Varying-based AA rect drawing 
Instead of calculating opacity from relative position in the shader, use a
shader varying to do this computation for us.

bug:5045101

Also adds a test to HwAccelerationTest to show incorrect antialiasing in
scaled drawAARect / boundarySize calculation.

Change-Id: Icdc41acb01dc10ce354834f8389a5aed2f439162
 2012-09-05 16:45:03 -07:00
Selim Gurun
fadf962d3c am a106ab46: am 18e87680: Merge "remove defunct javascript interface" into jb-mr1-dev 
* commit 'a106ab46ae07e1658ecfae20216995a275c11707':
  remove defunct javascript interface
 2012-09-05 16:30:08 -07:00
Jim Miller
000464ac01 Initial pass at re-enabling face unlock in new keyguard. 
Change-Id: I187629f9c4bfd810f11c73416db6e41b56f09a45
 2012-09-05 16:12:26 -07:00
Selim Gurun
a106ab46ae am 18e87680: Merge "remove defunct javascript interface" into jb-mr1-dev 
* commit '18e876806718e28edaa3cd9bb0262a9b400bc82b':
  remove defunct javascript interface
 2012-09-05 15:06:51 -07:00
Selim Gurun
18e8768067 Merge "remove defunct javascript interface" into jb-mr1-dev 2012-09-05 15:04:07 -07:00
Jason Sams
4be50f56c2 am 4017f496: am 6d617c2d: Merge "Stabilize perf data." into jb-mr1-dev 
* commit '4017f496742288b43ef8fa7dedadb0286a84cc46':
  Stabilize perf data.
 2012-09-05 13:55:59 -07:00
Jason Sams
f9abe58a33 am 7db45afb: am 3e777c79: Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev 
* commit '7db45afbe797ddfec772bfa5625b484d609db871':
  Add ColorMatrix Intrinsic.
 2012-09-05 13:54:17 -07:00
Jason Sams
4017f49674 am 6d617c2d: Merge "Stabilize perf data." into jb-mr1-dev 
* commit '6d617c2ddd848985fb98e0e54dc7f6234d814b7c':
  Stabilize perf data.
 2012-09-05 13:53:28 -07:00
Jason Sams
7db45afbe7 am 3e777c79: Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev 
* commit '3e777c79707d6c65e41ecd5a9b0e8f252ceafc90':
  Add ColorMatrix Intrinsic.
 2012-09-05 13:51:44 -07:00
Jason Sams
6d617c2ddd Merge "Stabilize perf data." into jb-mr1-dev 2012-09-05 13:50:36 -07:00
Jim Miller
de95460cce am 011071f3: am 27230f07: Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev 
* commit '011071f3f40ad088f0640317f4578f1b50d39669':
  Better flow for SIM PIN/ SIM PUK screens in keyguard.
 2012-09-05 13:50:07 -07:00
Jason Sams
3e777c7970 Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev 2012-09-05 13:48:58 -07:00
Jim Miller
011071f3f4 am 27230f07: Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev 
* commit '27230f076a0f3a3e461405cc61088fa306d9847c':
  Better flow for SIM PIN/ SIM PUK screens in keyguard.
 2012-09-05 13:47:35 -07:00
Jim Miller
27230f076a Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev 2012-09-05 13:45:30 -07:00
Michael Jurka
14895405c1 Fixing issue where recents items would go dim 
Bug: 6772614
Change-Id: I2f57f001d91d6cb445c58ac705e6c3ad1fa70dd3
 2012-09-05 13:40:50 -07:00
Jason Sams
76fb2973b9 Stabilize perf data. 
Change-Id: I75fb31b1bb6e6a7a5a82b86fd4a6639dd328ceaa
 2012-09-05 13:18:43 -07:00
Jim Miller
27ad7051aa am 529c3e2b: am 9ca26e43: Merge "Don\'t depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 
* commit '529c3e2b652edfb2604668bde34a6834d88077f4':
  Don't depend on LockPatternUtils to get DevicePolicyManager
 2012-09-05 12:54:17 -07:00
Jim Miller
529c3e2b65 am 9ca26e43: Merge "Don\'t depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 
* commit '9ca26e43652b516f6d38dc92120d802b5e8bfde4':
  Don't depend on LockPatternUtils to get DevicePolicyManager
 2012-09-05 12:51:45 -07:00
Jim Miller
9ca26e4365 Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 2012-09-05 12:49:31 -07:00