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

84598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
8387b4d86f am a6b5eca7: Merge "Don\'t trigger log for empty views" into jb-mr1-dev 
* commit 'a6b5eca796e3d70f29a42b32d742807f5b38aad9':
  Don't trigger log for empty views
 2012-09-06 15:11:39 -07:00
Chris Craik
a6b5eca796 Merge "Don't trigger log for empty views" into jb-mr1-dev 2012-09-06 15:07:46 -07:00
Chris Craik
3667aa364f Don't trigger log for empty views 
Change-Id: Idb2193d6dd064e5c4af1f02d0df2a83a7db0e0f8
 2012-09-06 14:59:15 -07:00
rich cannings
c376537dde am c862d0fc: Merge "Add secure setting for package verification" into jb-mr1-dev 
* commit 'c862d0fc0574de74bf1758f69c98ccbf8e506532':
  Add secure setting for package verification
 2012-09-06 14:58:52 -07:00
rich cannings
c862d0fc05 Merge "Add secure setting for package verification" into jb-mr1-dev 2012-09-06 14:55:55 -07:00
Chris Craik
263f27c22c am 776dafa8: Merge "Log if a view fails to fit in the drawing cache" into jb-mr1-dev 
* commit '776dafa8fe359df77de30b72ffc82d1d99e111c9':
  Log if a view fails to fit in the drawing cache
 2012-09-06 14:51:37 -07:00
Chris Craik
776dafa8fe Merge "Log if a view fails to fit in the drawing cache" into jb-mr1-dev 2012-09-06 14:49:18 -07:00
Chris Craik
10e9d1d7ad Log if a view fails to fit in the drawing cache 
Large software layers won't draw if they're larger than the size of the drawing
cache, in which case this log will be triggered.

bug:7078391
Change-Id: Ib42a060b8e3b3642417df9243a086aa15b2989b1
 2012-09-06 14:45:45 -07:00
Adam Cohen
137a4e6444 am 66b9fb16: Iintial stab at multi-user switcher on Keyguard 
* commit '66b9fb1662b304d24984af1ac4cc02f2ae8f4cc3':
  Iintial stab at multi-user switcher on Keyguard
 2012-09-06 14:41:02 -07:00
rich cannings
16e119e798 Add secure setting for package verification 
Framework changes to store and read a secure setting for package verification.
Default is on/true.

This setting will be turned on/off via the Settings app.

Bug: 7082362
Change-Id: I6f93d3136add8af0dbbdc664f0473c5f5b7e3fee
 2012-09-06 14:37:44 -07:00
Adam Cohen
66b9fb1662 Iintial stab at multi-user switcher on Keyguard 
Change-Id: I604a769ef43c354a8eeadb415e413c19ca02571d
 2012-09-06 14:35:56 -07:00
Jean-Baptiste Queru
a2de8728ea am fb3ec448: am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe" 
* commit 'fb3ec448f1208d75edebff0e93fa97a8913ff29e':
  Make SimpleSessionDescription locale safe
 2012-09-06 11:54:02 -07:00
Jean-Baptiste Queru
fb3ec448f1 am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe" 
* commit 'f66603e109d439e3a537cd3804706609ce86970e':
  Make SimpleSessionDescription locale safe
 2012-09-06 11:51:53 -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
Jean-Baptiste Queru
f66603e109 am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe" 
* commit '3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2':
  Make SimpleSessionDescription locale safe
 2012-09-06 11:49:38 -07:00
Baligh Uddin
49a7387418 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-06 11:47:29 -07:00
Jean-Baptiste Queru
3f3ce8adc7 am bf3e62b8: Merge "Make SimpleSessionDescription locale safe" 
* commit 'bf3e62b8913fc2fb88d6bb454a6491424cbd40c5':
  Make SimpleSessionDescription locale safe
 2012-09-06 11:47:29 -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
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
Jean-Baptiste Queru
bf3e62b891 Merge "Make SimpleSessionDescription locale safe" 2012-09-06 11:22:29 -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
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
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
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
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
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
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
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
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