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

100777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dirk Dougherty
47dae0771c Doc change: Update DC image, fix typo. 
Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d
 2013-02-22 09:54:45 -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
Kenny Root
8dda0956b6 am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read" 
* commit '49999acb049e09f99135e412cbb10d7367d2d607':
  StreamingZipInflater: fix mmap'd end of read
 2013-02-21 16:21:05 -08:00
Chris Craik
b98a016c67 Fix clipping and stencil layer issues 
bug:8235699

Ensure rectangle clipping operations disable deferring when necessary
(i.e., when the op might create a non-rect region), including in
DisplayList::setViewProperties

Additionally, makes clipping with a kUnion always use a region, for
consistency with software rendering

Change-Id: I6730f1a80250bcf3f91cd4afde646d470a12dbc2
 2013-02-21 16:12:00 -08:00
Michael Wright
fe98be7533 am 65b0052a: Merge "Remove SurfaceControl.setPosition(int, int)" 
* commit '65b0052a7473b73a18aef73460c9ebec77a2c2a0':
  Remove SurfaceControl.setPosition(int, int)
 2013-02-21 16:09:05 -08:00
Kenny Root
49999acb04 Merge "StreamingZipInflater: fix mmap'd end of read" 2013-02-22 00:05:36 +00:00
Michael Wright
65b0052a74 Merge "Remove SurfaceControl.setPosition(int, int)" 2013-02-22 00:05:10 +00:00
Michael Wright
b7b696ee71 Remove SurfaceControl.setPosition(int, int) 
This was just casting and calling the float version anyways, which Java does
automatically.

Bug: 8153162
Change-Id: If2f99995ff38b92e40777896baf6694786031898
 2013-02-21 15:52:50 -08:00
Christopher Tate
835aac396c am ab6b77fd: Merge "Be cool in backup/restore of apps that can\'t touch external storage" 
* commit 'ab6b77fd85979212299d8aef0b2c83c005b13abc':
  Be cool in backup/restore of apps that can't touch external storage
 2013-02-21 15:50:16 -08:00
Christopher Tate
ab6b77fd85 Merge "Be cool in backup/restore of apps that can't touch external storage" 2013-02-21 23:45:02 +00:00
Christopher Tate
5cb5c337d5 Be cool in backup/restore of apps that can't touch external storage 
Bug: 8241337
Change-Id: I23f6eeba8448b234a7b18ce50d2ced2ba54b4ebd
 2013-02-21 15:43:52 -08:00
Mathias Agopian
51eb127a17 am e4d3b06b: Merge "get rid of uses of getISurfaceTexture" 
* commit 'e4d3b06b6ddb055739b8b2aa82ffc7840588253a':
  get rid of uses of getISurfaceTexture
 2013-02-21 15:24:21 -08:00
Dirk Dougherty
4d149f58f5 am 6588a52e: am 95925649: am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '6588a52ecd56a477bbd1dc5ff37074615a278292':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 15:24:18 -08:00
Wink Saville
c7dcdfe872 am fb053cde: am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers" 
* commit 'fb053cde74483f901462b5a034dd2be90a5af0da':
  Allow three digit phone numbers
 2013-02-21 15:24:16 -08:00
Mathias Agopian
e4d3b06b6d Merge "get rid of uses of getISurfaceTexture" 2013-02-21 23:21:51 +00:00
Dirk Dougherty
6588a52ecd am 95925649: am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '959256498ab254a59617432f31205e000f3d8a8c':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 15:20:05 -08:00
Wink Saville
fb053cde74 am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers" 
* commit 'f7bf667d4a5e8e3fca75640f6352724826705128':
  Allow three digit phone numbers
 2013-02-21 15:19:53 -08:00
Jesse Hall
aa70f2217c Restore a mistakenly-removed null check 
Passing null to camera.setPreviewDisplay() needs to work; this
restores the behavior from before the Surface/SurfaceControl
refactoring.

Bug: 8225538
Change-Id: Ib73bfa9fe53457a41a69b7fe5dfff3a3aa260f52
 2013-02-21 15:06:27 -08:00
Dirk Dougherty
959256498a am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:29:33 -08:00
Dirk Dougherty
9de1383960 am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'd886d12854011894d9b5f4155179c11e571a1aee':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:25:37 -08:00
Wink Saville
f7bf667d4a am b5a1ce2f: Merge "Allow three digit phone numbers" 
* commit 'b5a1ce2f5daa20b5c77113b8887e12dcc05590fc':
  Allow three digit phone numbers
 2013-02-21 14:21:12 -08:00
Dirk Dougherty
d886d12854 am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'efa92b0bbe906bfac15936e5ab3f75a206cf3d24':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:21:02 -08:00
Dirk Dougherty
efa92b0bbe am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'f32cbc3d490845967e28b0995ac88187b197642c':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:18:06 -08:00
Daniel Sandler
da37acb2f7 am e9655887: Merge "Make Notification action data structures public." 
* commit 'e96558879ec7008ddf5647ad29d69ec1fad68c67':
  Make Notification action data structures public.
 2013-02-21 14:15:56 -08:00
Jeff Sharkey
fb09c375b1 am 2b3a47b9: Merge "Allow L2TP traffic to lockdown VPN servers." 
* commit '2b3a47b9ce0f422323395286937944a2afa51ed6':
  Allow L2TP traffic to lockdown VPN servers.
 2013-02-21 14:15:53 -08:00
Jeff Sharkey
0ff9af2ecb am c0997b0e: Merge "Improve notification UI for lockdown VPN." 
* commit 'c0997b0e6291d7c97963623eed2a41994a7855cf':
  Improve notification UI for lockdown VPN.
 2013-02-21 14:15:51 -08:00
Irfan Sheriff
c538b730d4 am 8a64b1a7: Handle airplane settings properly 
* commit '8a64b1a7f4b07e71b9eb0f4a98710cb1409588bf':
  Handle airplane settings properly
 2013-02-21 14:15:47 -08:00
Irfan Sheriff
6f85bdcacc am b8c0e009: Restructure wifiservice for clarity 
* commit 'b8c0e009a74ac2eaee8946fbe0bb3b3fe2749c9a':
  Restructure wifiservice for clarity
 2013-02-21 14:15:45 -08:00
Irfan Sheriff
713422afab am d017f352: Move wifiservice into its own package 
* commit 'd017f3523244974a8a3fb653ed4b6d514affcc01':
  Move wifiservice into its own package
 2013-02-21 14:15:42 -08:00
Craig Mautner
4636dc4c5d am 7a7360ad: Merge "Add null check to setAppGroupId." 
* commit '7a7360ad528576d560aa13fbb4e81740b2c425b2':
  Add null check to setAppGroupId.
 2013-02-21 14:15:39 -08:00
Dirk Dougherty
f32cbc3d49 Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
bug: 8033647
bug: 8033688

Change-Id: Id7b5efd48f8e13ba8c8f4ab0e0f8e5dc736b1691
 2013-02-21 13:29:07 -08:00
Ben Murdoch
1c8d7f0952 Update WebView.PictureListener.onNewPicture to pass null picture. 
When targetting >= CUR_DEVELOPMENT, the WebView.PictureListener.onNewPicture API
should pass a null picture in the callback.

Bug: 8209022, 8244082
Change-Id: I280c7cc89f2a12b1273cd67bbe2c7a6f2ca5892f
 2013-02-21 20:35:21 +00:00