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

85349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
c308053296 am 4d77a4ad: (-s ours) am 49a73874: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4d77a4ad13db9183fe2177754cd9b710022bc7bb':
  Import translations. DO NOT MERGE
 2012-09-06 11:53:11 -07:00
Baligh Uddin
4d77a4ad13 am 49a73874: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '49a7387418c24f03d9248e0cbc12c59d8516ba83':
  Import translations. DO NOT MERGE
 2012-09-06 11:50:18 -07:00
Dianne Hackborn
59ad17ed08 am 99b23e2c: am fae0d662: Merge "Nested fragments." into jb-mr1-dev 
* commit '99b23e2c873ff6df5f6609bc87a3bdb9ae33e5ba':
  Nested fragments.
 2012-09-06 11:48:43 -07:00
Baligh Uddin
49a7387418 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-06 11:47:29 -07:00
Baligh Uddin
1d00ccc3db Merge "Import translations. DO NOT MERGE" 2012-09-06 11:45:18 -07:00
Dianne Hackborn
99b23e2c87 am fae0d662: Merge "Nested fragments." into jb-mr1-dev 
* commit 'fae0d66275d3a5fb5e51f346ab2c542746f41c20':
  Nested fragments.
 2012-09-06 11:45:07 -07:00
Baligh Uddin
5c2cc8acea am 9fbd9e5a: (-s ours) am 6f7c1391: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9fbd9e5a4d8e0304a7c497c7e02cc5751741b7c0':
  Import translations. DO NOT MERGE
 2012-09-06 11:42:01 -07:00
Dianne Hackborn
fae0d66275 Merge "Nested fragments." into jb-mr1-dev 2012-09-06 11:41:48 -07:00
Baligh Uddin
9fbd9e5a4d am 6f7c1391: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6f7c139137e12cabfad3922f42f48c53906388a7':
  Import translations. DO NOT MERGE
 2012-09-06 11:40:07 -07:00
Baligh Uddin
6f7c139137 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-06 11:37:34 -07:00
Baligh Uddin
572f34010e Merge "Import translations. DO NOT MERGE" 2012-09-06 11:29:32 -07:00
Daniel Sandler
1301c0d598 am 5caa987e: am 40e86a56: Merge "New "Start dreams" launcher shortcut." into jb-mr1-dev 
* commit '5caa987e1042b8e63ae656b0b97c8f7b63b3caad':
  New "Start dreams" launcher shortcut.
 2012-09-06 11:10:10 -07:00
Daniel Sandler
5caa987e10 am 40e86a56: Merge "New "Start dreams" launcher shortcut." into jb-mr1-dev 
* commit '40e86a56da7a39bc899ca78a69258199c2640420':
  New "Start dreams" launcher shortcut.
 2012-09-06 11:07:40 -07:00
Dianne Hackborn
62bea2f171 Nested fragments. 
Change-Id: I79acc19b391352c16b06afee2ca543223c38e364
 2012-09-06 11:05:53 -07:00
Daniel Sandler
40e86a56da Merge "New "Start dreams" launcher shortcut." into jb-mr1-dev 2012-09-06 11:04:45 -07:00
Chris Craik
27075b665c am ed8ecc2c: am 378d131e: Merge "Varying-based AA rect drawing" into jb-mr1-dev 
* commit 'ed8ecc2c9674c2c97d804105ba09f5f509c04061':
  Varying-based AA rect drawing
 2012-09-06 10:56:11 -07:00
Chris Craik
ed8ecc2c96 am 378d131e: Merge "Varying-based AA rect drawing" into jb-mr1-dev 
* commit '378d131e65348d199db36c21ba7156542bbf0045':
  Varying-based AA rect drawing
 2012-09-06 10:54:06 -07:00
Chris Craik
378d131e65 Merge "Varying-based AA rect drawing" into jb-mr1-dev 2012-09-06 10:52:14 -07:00
Irfan Sheriff
c6d4ed64b8 am b068af61: am 369bb97d: Merge "P2p API for WFD" into jb-mr1-dev 
* commit 'b068af61cabb715b7475156898f3031c6be868c4':
  P2p API for WFD
 2012-09-06 09:58:48 -07:00
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
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