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

101112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
84956b36ec am ce7533d2: am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit 'ce7533d24f6d06011728272a11801b693aa224f2':
  fix javadocs
 2013-02-22 13:51:44 -08:00
Dirk Dougherty
ce7533d24f am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit 'a4ebda27c9c4c6383520b07d4130b02f0564da27':
  fix javadocs
 2013-02-22 13:48:02 -08:00
Romain Guy
505d1d64ed Merge "Prettify display lists logging" 2013-02-22 21:45:57 +00:00
Dirk Dougherty
a4ebda27c9 am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit '380d571a65ec6866768c74e3ff360a6620b0d212':
  fix javadocs
 2013-02-22 13:44:11 -08:00
Dirk Dougherty
380d571a65 am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit 'dc591c0bf6394f725e5dcf773193adba14e5ccaf':
  fix javadocs
 2013-02-22 13:41:56 -08:00
Dirk Dougherty
dc591c0bf6 am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit 'f15b0908a773850007c0d0b6de54b1dc008abf6f':
  fix javadocs
 2013-02-22 13:38:34 -08:00
Jason Sams
ec39a94ac2 Merge "Implement USAGE_IO_INPUT" 2013-02-22 21:35:12 +00:00
Dirk Dougherty
f15b0908a7 Merge "fix javadocs" into jb-mr1-dev 2013-02-22 21:35:11 +00:00
Robert Ly
894174b4b0 fix javadocs 
Change-Id: Iba5344980ecaaff5efcc60f8515af23957b64687
 2013-02-22 13:32:43 -08:00
Adam Powell
d61ff77ee1 Merge "Fix ListView is not scrolled properly with arrows" 2013-02-22 21:29:44 +00:00
Jason Sams
72226e0543 Implement USAGE_IO_INPUT 
Change-Id: Id5b9e3d0a17e4df15eec36d542fde6dc626138b2
 2013-02-22 12:45:54 -08:00
Adam Koch
51b4484a2d am 42e15925: am c2226157: am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 
* commit '42e1592523b9e805f3f1111bd6687ff1ff577dc5':
  Displaying Bitmaps Efficiently Training - Update sample app zip
 2013-02-22 12:12:47 -08:00
Adam Koch
42e1592523 am c2226157: am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 
* commit 'c22261578ae11dc12393346565a374b64678d0d0':
  Displaying Bitmaps Efficiently Training - Update sample app zip
 2013-02-22 12:09:15 -08:00
Adam Koch
c22261578a am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 
* commit '16fcd4ba4ab72c3ae45bf8b9cc084dfb193465c3':
  Displaying Bitmaps Efficiently Training - Update sample app zip
 2013-02-22 12:06:29 -08:00
Adam Koch
16fcd4ba4a am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 
* commit 'e74f2a32a416a42feb13a5cba31a1f7567d77a0a':
  Displaying Bitmaps Efficiently Training - Update sample app zip
 2013-02-22 12:03:42 -08:00
Robert Greenwalt
a3f0665c62 Merge "Improve ConnectivityManager docs" 2013-02-22 20:02:02 +00:00
Adam Koch
e74f2a32a4 am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 
* commit 'b367fd6a87116933b76e5e9bc162dcfe88306aa6':
  Displaying Bitmaps Efficiently Training - Update sample app zip
 2013-02-22 12:01:39 -08:00
Adam Koch
b367fd6a87 Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 2013-02-22 19:58:34 +00:00
Romain Guy
7031ff68bb Prettify display lists logging 
This change makes it a lot easier to see the tree structure.

Change-Id: I4969abd1eb010f1d529671f8d86dc4c930be24f6
 2013-02-22 11:51:15 -08:00
Ian Rogers
7508039d66 am 631bc614: am 08a92a33: Merge "Account malloc mmaped pages as native heap." 
* commit '631bc614f52015a2f068c2e66030e9aa47508fb5':
  Account malloc mmaped pages as native heap.
 2013-02-22 11:04:16 -08:00
Ian Rogers
631bc614f5 am 08a92a33: Merge "Account malloc mmaped pages as native heap." 
* commit '08a92a335fd84ca427b55c6c2d39f72970d82b76':
  Account malloc mmaped pages as native heap.
 2013-02-22 10:53:59 -08:00
Craig Mautner
12e563fff9 Merge "Create rotation animation modes." 2013-02-22 18:51:21 +00:00
Craig Mautner
3c1743705c Create rotation animation modes. 
Allow fullscreen windows to specify crossfade or jumpcut animations
that override the default rotation animation. Only if the incoming
and outgoing topmost windows are fullscreen and both specify the
same animation to use.

Fixes bug 8182773.

Change-Id: I6b3c0020d7bd2cdfba5c66189e114ec62cd54fcf
 2013-02-22 10:44:52 -08:00
Irfan Sheriff
d99375528c Merge "Clean up scan handling" 2013-02-22 18:40:24 +00:00
Robert Greenwalt
5a6bdc46e2 Improve ConnectivityManager docs 
Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
 2013-02-22 10:39:20 -08:00
Derek Sollenberger
bc340d03c3 Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" 2013-02-22 18:39:13 +00:00
Daniel Sandler
9d81e32455 Merge "Make QUICK_CLOCK work on tablets." 2013-02-22 18:19:35 +00:00
Dirk Dougherty
e08f1c0251 am 531a5996: am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '531a599660cde37fd7c50969b8f4abdbe5a0baa7':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:18:30 -08:00
Dirk Dougherty
531a599660 am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '82f810f3d4e70c264cb81c0cb6caaec2e864ebd0':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:15:52 -08:00
Dirk Dougherty
82f810f3d4 am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit 'bc1a863f687a2bbe9ae71ed22a3ebfaf7f8bbd26':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:12:14 -08:00
Dirk Dougherty
bc1a863f68 am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '094023a7f155270a0f4ee54b8dd8282d4ffbea23':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:08:19 -08:00
Dirk Dougherty
094023a7f1 am 47dae077: Doc change: Update DC image, fix typo. 
* commit '47dae0771cb0db98ff829e19bf505f8628745878':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:06:09 -08:00
Adam Koch
9bceb5603e Displaying Bitmaps Efficiently Training - Update sample app zip 
Change-Id: I97faf4bcf5c46083fdbe2bb094be9a3bcfff0bd8
 2013-02-22 13:03:06 -05:00
Ian Rogers
08a92a335f Merge "Account malloc mmaped pages as native heap." 2013-02-22 18:02:40 +00:00
Dirk Dougherty
47dae0771c Doc change: Update DC image, fix typo. 
Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d
 2013-02-22 09:54:45 -08:00
Ian Rogers
afc10e174d Account malloc mmaped pages as native heap. 
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.

[1] https://android-review.googlesource.com/#/c/49583/3

Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
 2013-02-22 09:40:58 -08:00
Baligh Uddin
5d5ac5bb0a Import translations. DO NOT MERGE 
Change-Id: I26214599db1cab9d2c5847860d43e008d0e463ab
Auto-generated-cl: translation import
 2013-02-22 09:25:20 -08:00
Irfan Sheriff
bcc97ca43a Clean up scan handling 
Remove obsolete active/passive scan handling - drivers always
do active scan.

Also, remove AP_SCAN hack for preventing connections and use
the TYPE=ONLY scan.

Bug: 8158647
Change-Id: I8f70e19219ad789b7501a40529bcd6b6524739e8
 2013-02-22 09:23:55 -08:00
Derek Sollenberger
25bea647c2 Merge remote-tracking branch 'goog/master-chromium' into 'goog/master' 
bug: 6906025
Change-Id: Ica9524b017abb6124f6cd0e11fd36c64f2cee68a
 2013-02-22 09:51:59 -05:00
Ben Murdoch
5875cc6b27 am b8495145: Merge "Update WebView.PictureListener.onNewPicture to pass null picture." 
* commit 'b84951451c35813ccf8aefdb12f5092926785fd4':
  Update WebView.PictureListener.onNewPicture to pass null picture.
 2013-02-22 04:53:24 -08:00
Ben Murdoch
b84951451c Merge "Update WebView.PictureListener.onNewPicture to pass null picture." 2013-02-22 12:43:42 +00:00
Jesse Hall
cbd3789801 am ab10f3c5: Merge "Restore a mistakenly-removed null check" 
* commit 'ab10f3c5b939f3d7afe6d5561d761fc5299572bc':
  Restore a mistakenly-removed null check
 2013-02-21 22:10:15 -08:00
Jesse Hall
ab10f3c5b9 Merge "Restore a mistakenly-removed null check" 2013-02-22 06:05:40 +00:00
Craig Mautner
be88cb1d6c am 47e8074d: Merge "Update histories simultaneously." 
* commit '47e8074d401b0a2c38b376329bfe8bf1f62da23b':
  Update histories simultaneously.
 2013-02-21 20:06:14 -08:00
Craig Mautner
47e8074d40 Merge "Update histories simultaneously." 2013-02-22 04:02:24 +00:00
Craig Mautner
b44de0d910 Update histories simultaneously. 
In moveTaskToBackLocked calls that used mHistory were being made
between the times that mTaskHistory and mHistory were modified. This
caused an inconsistent state that led to Windows arranged out of
order. Updating both history stacks at the same time fixes this.

Fixes bug 8244261.

Change-Id: I9669762ad39b06ab6d401122702b74969d4dc658
 2013-02-21 20:00:58 -08:00
Chris Craik
94b97b38b7 am eab51de4: Merge "Fix clipping and stencil layer issues" 
* commit 'eab51de4de88219256260fe26e2018a6234ef83b':
  Fix clipping and stencil layer issues
 2013-02-21 19:31:17 -08:00
Chris Craik
eab51de4de Merge "Fix clipping and stencil layer issues" 2013-02-22 03:28:06 +00:00
Kenny Root
4e89d1a9b2 am 893df066: am 8dda0956: am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read" 
* commit '893df066bbd156b05171e68204a407a212c507e9':
  StreamingZipInflater: fix mmap'd end of read
 2013-02-21 16:28:14 -08:00
Kenny Root
893df066bb am 8dda0956: am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read" 
* commit '8dda0956b6565a958989af44e885b94dc9bfc9bd':
  StreamingZipInflater: fix mmap'd end of read
 2013-02-21 16:24:41 -08:00