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

101355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
d088baa2a1 Merge "Fix activity to task bugs" 2013-03-05 17:06:47 +00:00
The Android Open Source Project
19fcef1cbd am a0d99936: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'a0d99936ff7ca85b59e0228eefc0fab79b7dbe0f':
 2013-03-05 15:58:56 +00:00
The Android Open Source Project
a0d99936ff Reconcile with jb-mr2-release - do not merge 
Change-Id: I23e62c9126054bf0b34fe9125bca81bf6791006f
 2013-03-05 07:53:23 -08:00
Adam Koch
0dbeffe7b6 am ab999fe4: am 25a3b1dd: am cc3fec69: am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit 'ab999fe44f142072cb1dbd3b81d591014700b662':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 14:42:33 +00:00
Adam Koch
ab999fe44f am 25a3b1dd: am cc3fec69: am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '25a3b1ddeb470737ba8d05baabd6f3e5ad394ab0':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 14:40:20 +00:00
Adam Koch
25a3b1ddeb am cc3fec69: am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit 'cc3fec699d9fdf57a080106e6ca7b3ae845f1446':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 14:38:30 +00:00
Adam Koch
cc3fec699d am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '0c8dfd7d281d037df3d427ccb6bf4642b2617a63':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:36:31 -08:00
Adam Koch
0c8dfd7d28 am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1061c578b1a341ecb7286009daa9173e0b7e0dc0':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:33:56 -08:00
Adam Koch
1061c578b1 am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '095aa4b611472f64bdbd1499d05b747cebc3f792':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:32:13 -08:00
Adam Koch
095aa4b611 am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1a5bec0127ca4584008a1ab9e1ce49e671f8387c':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:30:03 -08:00
Chet Haase
573596de3b Merge "ListView transient state fix" 2013-03-05 14:26:35 +00:00
Adam Koch
1a5bec0127 Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 2013-03-05 14:25:51 +00:00
The Android Automerger
4017550be9 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-05 05:55:36 -08:00
Marco Nelissen
9ac3c67dc7 am 8c6b3b93: am daa95754: am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit '8c6b3b93e2ebe8db06165f6378d86cac2c606171':
  Performance increase in thumbnail handling
 2013-03-05 05:45:02 +00:00
Marco Nelissen
8c6b3b93e2 am daa95754: am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit 'daa95754a53a9f90c4afaa4eccdc25f08fd2d264':
  Performance increase in thumbnail handling
 2013-03-05 05:42:37 +00:00
Marco Nelissen
daa95754a5 am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit '056c610c9ba83fbf68e15fa4557620dc7820f087':
  Performance increase in thumbnail handling
 2013-03-05 05:40:40 +00:00
Craig Mautner
778787728d Fix activity to task bugs 
- Fix bug when task has been removed from mTaskHistory by
adding it back in at the top.
- Fix reparenting bug introduced by refactor of
resetTaskIfNeededLocked.

Change-Id: I93df2e62c6aed805fe888847dcf96a1fe0d7be26
 2013-03-04 21:32:05 -08:00
Craig Mautner
f041389a72 Merge "Convert mHistory to mTaskHistory (9)" 2013-03-05 03:34:48 +00:00
Romain Guy
4001b31cba am 370929f4: am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 
* commit '370929f4bf6b9d7a196eae531f38cdec19140dfd':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
 2013-03-05 03:15:37 +00:00
Romain Guy
370929f4bf am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 
* commit 'd23b2747eff9ae3203f96039794068e9f1b0c71b':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
 2013-03-05 03:14:14 +00:00
Romain Guy
d23b2747ef Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 2013-03-05 03:11:11 +00:00
Romain Guy
e78b8003a5 Finish current Canvas operations then resume previous Canvas 
Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
 2013-03-04 19:08:02 -08:00
Mathias Agopian
c18fb64084 am e94fcd6c: am 188f8c5e: Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 
* commit 'e94fcd6c494931afc1d7f70138db01de37cdb9fc':
  screenshots can now go into a Surface from java
 2013-03-05 02:37:43 +00:00
Mathias Agopian
e94fcd6c49 am 188f8c5e: Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 
* commit '188f8c5e4b266429b07b4381d58d33b1e771be48':
  screenshots can now go into a Surface from java
 2013-03-05 02:35:07 +00:00
Mathias Agopian
188f8c5e4b Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 2013-03-05 02:31:15 +00:00
Romain Guy
d4989e6894 am e8915696: am 836f93dc: Merge "Never resize a Bitmap down to 0 at load time Bug #8313929" into jb-mr2-dev 
* commit 'e89156968dc917dfbae2f3965513f3cee73b9355':
  Never resize a Bitmap down to 0 at load time Bug #8313929
 2013-03-05 02:04:03 +00:00
Romain Guy
e89156968d am 836f93dc: Merge "Never resize a Bitmap down to 0 at load time Bug #8313929" into jb-mr2-dev 
* commit '836f93dc5f00536baa56f7c035c424a130f9c2a3':
  Never resize a Bitmap down to 0 at load time Bug #8313929
 2013-03-05 02:02:03 +00:00
Romain Guy
836f93dc5f Merge "Never resize a Bitmap down to 0 at load time Bug #8313929" into jb-mr2-dev 2013-03-05 01:57:26 +00:00
Romain Guy
fe28ef84f2 Never resize a Bitmap down to 0 at load time 
Bug #8313929

Change-Id: Ic9b691319f162228c72ad1afed4dfe0b4181c422
 2013-03-04 17:55:55 -08:00
Mathias Agopian
0449a40586 screenshots can now go into a Surface from java 
A Surface can trivially be created from a SurfaceTexture.
Update ElectronBeam to use this new API.

Bug: 6940974
Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
 2013-03-04 17:45:26 -08:00
Craig Mautner
70a86933b8 Convert mHistory to mTaskHistory (9) 
- Convert startActivityLocked from mHistory to mTaskHistory.
- Fix NPE bug in resetTaskIfNeededLocked.

Change-Id: I1598446199634bb455bc06377248fe940d5cb9d4
 2013-03-04 17:26:35 -08:00
Brian Carlstrom
8df79da5d1 am 31167ffb: am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '31167ffb2def7461edbac9b8c35366bb6a0e5881':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 01:02:41 +00:00
Brian Carlstrom
31167ffb2d am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '42ca4975dc6ec2c206f8e7e883e1d0d549b44c95':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 01:00:06 +00:00
Brian Carlstrom
42ca4975dc am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 00:56:05 +00:00
Marco Nelissen
056c610c9b am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit 'b6a2978a5118d66bcebc380b0c20e566b7cbdfda':
  Performance increase in thumbnail handling
 2013-03-04 16:31:26 -08:00
Marco Nelissen
b6a2978a51 Merge "Performance increase in thumbnail handling" 2013-03-05 00:06:33 +00:00
Jeff Sharkey
bf182c8869 am cab82015: am a096f241: am 237940a0: (-s ours) am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'cab8201526cd25054c0c54bc865aa95d5808d690':
  Tighten enforcement of file modes.
 2013-03-05 00:03:07 +00:00
Jeff Sharkey
cab8201526 am a096f241: am 237940a0: (-s ours) am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'a096f241657eec46c1202f9194907efb7073e247':
  Tighten enforcement of file modes.
 2013-03-05 00:01:37 +00:00
Philip Milne
c2a6e194a6 Merge "Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value." 2013-03-05 00:00:12 +00:00
Jeff Sharkey
a096f24165 am 237940a0: (-s ours) am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '237940a0923ff7642cf2a043e65950297e91cf75':
  Tighten enforcement of file modes.
 2013-03-04 23:56:56 +00:00
Philip Milne
f091b66246 Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value. 
This is an addendum to:

https://googleplex-android-review.googlesource.com/#/c/246507

Change-Id: Ia9d6fdfe7fdb76c1152466315ff3b1c42c077ee2
 2013-03-04 15:46:22 -08:00
Dave Burke
1f17ddfcac am 1976dd91: am 71f6426a: Merge "Add nullness check." into jb-mr2-dev 
* commit '1976dd91edf6823f7ea5d42ae3ea48eb8f425cf5':
  Add nullness check.
 2013-03-04 23:39:53 +00:00
Dave Burke
1976dd91ed am 71f6426a: Merge "Add nullness check." into jb-mr2-dev 
* commit '71f6426ac3787f22a0078ed42dbf8f568eebf2f8':
  Add nullness check.
 2013-03-04 23:37:48 +00:00
Dave Burke
71f6426ac3 Merge "Add nullness check." into jb-mr2-dev 2013-03-04 23:33:26 +00:00
Dave Burke
c9b6be7c40 Add nullness check. 
Bug: 8313121
Change-Id: Id2221e1c77eaf749ab4c4f6ec4cfa6684927c751
 2013-03-04 15:20:42 -08:00
Nick Kralevich
6d190338fc am 0e5b5f66: am 0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 
* commit '0e5b5f6619f45db6cdff7757d208c197a3d4a3b1':
  EntropyMixer: Write entropy at shutdown / reboot / power
 2013-03-04 22:45:44 +00:00
Nick Kralevich
0e5b5f6619 am 0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 
* commit '0841c4cbdcedd32bfea4126d17876c6c892875e8':
  EntropyMixer: Write entropy at shutdown / reboot / power
 2013-03-04 22:44:03 +00:00
Irfan Sheriff
2ba8de33ec am bfadb84f: am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev 
* commit 'bfadb84f9d44ee2f74db394cec431059201b0086':
  Clean up statemachine
 2013-03-04 22:42:10 +00:00
Irfan Sheriff
bfadb84f9d am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev 
* commit 'f9d3020c575fd20097f599dc336a3b448415b7d7':
  Clean up statemachine
 2013-03-04 22:40:35 +00:00
Nick Kralevich
0841c4cbdc Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 2013-03-04 22:40:17 +00:00