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

114517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
692af53a20 am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev 
* commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a':
  Cleanup the shutdown of BatchedScans.
 2013-09-20 11:22:35 -07:00
Scott Main
0216929e19 am 81c494b6: am 562ce888: am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '81c494b68046dbee464c7cc703595ecdb685723f':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 11:22:23 -07:00
John Spurlock
812632b95b am d4c2b67e: am 560d2e46: Merge "Include starting windows in the sysui vis calculation." into klp-dev 
* commit 'd4c2b67ea6b084b8242ad2aa054c749e1f26d13b':
  Include starting windows in the sysui vis calculation.
 2013-09-20 11:22:10 -07:00
Maggie Benthall
ca4ffc599e am b0bd2bfd: am db93e1d7: Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 
* commit 'b0bd2bfdbc878d4f23e3277704e3c9a82b112381':
  UX compliance for CA Cert warning tile in QuickSettings
 2013-09-20 11:22:00 -07:00
Daniel Sandler
806fa829b4 am 0cc92983: am 4e6f752f: Put soundpooled sounds in the right place. 
* commit '0cc9298320fa6f018f0a2b7292057be46964c15c':
  Put soundpooled sounds in the right place.
 2013-09-20 11:21:56 -07:00
Jim Miller
bbfd7e3ca2 am aef89022: am 3855b99f: Fix the build - replace broken assets. 
* commit 'aef8902245bdde18a3bd168e8706cd1e009f4d24':
  Fix the build - replace broken assets.
 2013-09-20 11:21:29 -07:00
Jeff Sharkey
f97d4681d3 am 89dec7e6: am a9ce049d: Load RootInfo in background, invalidation. 
* commit '89dec7e6e9ab98141de89096ef052cb2c158c557':
  Load RootInfo in background, invalidation.
 2013-09-20 11:21:26 -07:00
Michael Jurka
20ce157923 am 48c52bea: am bdac73fe: Merge "Fix default wallpaper dimensions" into klp-dev 
* commit '48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d':
  Fix default wallpaper dimensions
 2013-09-20 11:21:23 -07:00
Christopher Tate
cc5db25485 am 2e6eef65: am 3301f76b: Merge "Don\'t back up apps in the \'stopped\' state" into klp-dev 
* commit '2e6eef655f079536251ff030d38fb6480dd97a18':
  Don't back up apps in the 'stopped' state
 2013-09-20 11:21:18 -07:00
Jim Miller
3f943b1143 am f3d1ef00: am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev 
* commit 'f3d1ef00c571657bd0464d157905c6b4fae2136f':
  Add camera affordance to navigation bar on phones
 2013-09-20 11:21:11 -07:00
Svetoslav
6e1e8b17c5 am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 
* commit 'c0e1ae0176b2ce23ea1b19883507cd920712289a':
  Move PdfDocument to android.graphics.pdf
 2013-09-20 11:21:05 -07:00
Craig Mautner
d052ee34a5 am f15024c8: am 12946530: Merge "Only show launcher for the bottom activity in a task" into klp-dev 
* commit 'f15024c8c8b3d21919347070909049c61c14ae06':
  Only show launcher for the bottom activity in a task
 2013-09-20 11:21:00 -07:00
David Braun
119ad51710 am e28962fe: am 3372cb26: Merge "Add config setting for default sms app." into klp-dev 
* commit 'e28962fe8e109d240b2f76988f93234e76a8eab9':
  Add config setting for default sms app.
 2013-09-20 11:20:53 -07:00
Glenn Kasten
1f6ec93f12 am 0fbb7484: am 9d53e30e: Merge "Workaround for slow AudioRecord destructor" into klp-dev 
* commit '0fbb74847aec65b057cad019d86617d9703c7c7a':
  Workaround for slow AudioRecord destructor
 2013-09-20 11:20:47 -07:00
Joe Fernandez
a48dfca9e4 am cda15002: am a17309fd: am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit 'cda1500201fb549caa6f324f61c2ad21bcd81536':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-20 11:20:41 -07:00
Joe Fernandez
3f3d49a032 am 29ccf51f: am 27f525c4: am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '29ccf51fc7c48559e20a1650837c9210f3cfe788':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-20 11:20:37 -07:00
Ed Heyl
083ebcf49a am 3ece8270: am 812c4d73: Merge "fix typo" into klp-dev 
* commit '3ece8270173df27518c16a5904ae5fe3c6b51913':
  fix typo
 2013-09-20 11:20:33 -07:00
Leon Scroggins III
29baa03ba5 am 2360ada9: am 57989c0e: Merge "Skip writing zeroes to java allocated memory." into klp-dev 
* commit '2360ada939b0abd4a6cca794288ff06701219f19':
  Skip writing zeroes to java allocated memory.
 2013-09-20 11:20:22 -07:00
Victoria Lease
9e233b54b6 am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp-dev 
* commit 'ab99b39d7d152de35ea02a364190ff325da4015b':
  fix emoji clipping in hw draw path
 2013-09-20 11:20:06 -07:00
Amith Yamasani
fa80ffa4fd am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev 
* commit '638918a2681cff345b9e3bd5ff7b170a874125dc':
  Fix a regression in pausing activity immediately on sleep
 2013-09-20 11:20:03 -07:00
Eino-Ville Talvala
84fa15ce63 am f3c61c66: am a84ca8a3: Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev 
* commit 'f3c61c6657fb2a25e5ac04e55ce0d7eefabc07f7':
  TextureView/GLES20Canvas: Support synchronous GLConsumers
 2013-09-20 11:19:45 -07:00
Robert Greenwalt
eccc0905bd am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev 
* commit '540784f903c8a9e808ef88d14fe5e1227bda4561':
  Cleanup the shutdown of BatchedScans.
 2013-09-20 10:50:39 -07:00
Robert Greenwalt
540784f903 Merge "Cleanup the shutdown of BatchedScans." into klp-dev 2013-09-20 17:43:30 +00:00
Dianne Hackborn
9bef5b67dc resolved conflicts for merge of 20021b30 to master 
Change-Id: Ie758de25a277ed0a25bf08e4cd2c57c9519bd52d
 2013-09-20 10:40:34 -07:00
Scott Main
81c494b680 am 562ce888: am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '562ce888af21fc18d1610545ff6373ee2ecbbb13':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:12:53 -07:00
Scott Main
562ce888af am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '8f6ed205a2523a8170cdd3e824170fd77c4fd65a':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:10:22 -07:00
Scott Main
8f6ed205a2 am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '208e6079b4ccd161de198553319d285711564ea2':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:07:46 -07:00
Scott Main
208e6079b4 am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '0333302ad7162f66404c08e1c6c5b6b767aa78b3':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:04:26 -07:00
Igor Murashkin
52c77ea4d1 am a7dd66a4: am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev 
* commit 'a7dd66a4709353cd27b4482be73d2b3804cbeaa6':
  Camera2Tests: create new directory for manual camera2 test apps
 2013-09-20 09:58:48 -07:00
Yuhao Zheng
5380b780bb am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev 
* commit '2e9a426529c54774b23609bee8d50118118ab895':
  Remove STOPSHIP in WifiWatchdogStateMachine
 2013-09-20 09:58:45 -07:00
Craig Mautner
de4232f721 am 9ea8bf15: am 7908f190: Merge "Debug for b/10689184." into klp-dev 
* commit '9ea8bf154cdad4b4cb627d9d6c9a9bc01c31abcd':
  Debug for b/10689184.
 2013-09-20 09:58:41 -07:00
Scott Main
0333302ad7 Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 2013-09-20 16:58:39 +00:00
petergng@google.com
594c72c8ed am a13e5dd3: am fe4643bb: Merge "Increasing visibility of pressed feedback for default ui widget assets" into klp-dev 
* commit 'a13e5dd3a953344dd3b702b6325a8e58be015625':
  Increasing visibility of pressed feedback for default ui widget assets
 2013-09-20 09:58:35 -07:00
Craig Mautner
2c34bd6a9a am cd569b31: am e8a94224: Merge "Return tasks in correct order." into klp-dev 
* commit 'cd569b31d398fe846eeee567d2816a3bb93dd493':
  Return tasks in correct order.
 2013-09-20 09:58:22 -07:00
Christopher Tate
0719715586 am 654aad21: am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev 
* commit '654aad21609642f7d0891962d72c0dfd4077fb94':
  Support for "not the home app you're looking for" metadata
 2013-09-20 09:58:18 -07:00
John Spurlock
03d4a0920c am cc8dc013: am 0286f5e2: Merge "Bar gradients now 55% to 0% black." into klp-dev 
* commit 'cc8dc0139ef11e8f34a22dfeb5073921030ccf98':
  Bar gradients now 55% to 0% black.
 2013-09-20 09:58:13 -07:00
Amith Yamasani
25fd841bd5 am 80af4f7b: am 7301bd96: Merge "Use a separate thread for services that do NTP lookup" into klp-dev 
* commit '80af4f7b098aa912dcc7c2ccaf4a559e15e608ff':
  Use a separate thread for services that do NTP lookup
 2013-09-20 09:58:08 -07:00
Jeff Sharkey
cc288455e6 am ba8129f1: am 18b94817: Merge "Also catch one more tablet layout NPE." into klp-dev 
* commit 'ba8129f1b15de500f46bd2adee251bf5d8bf5bbd':
  Also catch one more tablet layout NPE.
 2013-09-20 09:57:57 -07:00
Jeff Sharkey
ff8bd2316e am 5de6787d: am 7cb93f4e: Merge "Fix tablet layout and resources." into klp-dev 
* commit '5de6787d1e90991af85d677bf38e242fcba427a1':
  Fix tablet layout and resources.
 2013-09-20 09:57:51 -07:00
Derek Sollenberger
8fa4e29f16 am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev 
* commit '23b7bc1b4409ca5844db5f17992b906aa3e63927':
  Update SkTypeface::CreateFromName to handle NULL if familyName does not match
 2013-09-20 09:57:42 -07:00
Baligh Uddin
457767d267 am be643364: (-s ours) am 25f9f364: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'be64336477bf3445da13b29236b6aa038d053daf':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:33 -07:00
Baligh Uddin
58c35d0b61 am 16c68d62: (-s ours) am 07cf6487: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '16c68d62965f97fdc18650181c7faebe27729182':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:29 -07:00
Geoffrey Borggaard
cf83beee99 am ce040924: am 5b05a115: Merge "Remove char limit." into klp-dev 
* commit 'ce040924f7dcfea558e432f9e4c5a643ff2623ef':
  Remove char limit.
 2013-09-20 09:57:25 -07:00
Baligh Uddin
b6f0dcff71 am 26aa6e90: (-s ours) am 8074862d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '26aa6e904c017abe9b7ce0773f5a353cabae93aa':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:22 -07:00
Svetoslav
03e9838357 "resolved conflicts for merge of db7659e0 to master" 
Change-Id: I5c09680bbc6263d38f995f053c747199eb569c32
 2013-09-20 09:54:56 -07:00
Robert Greenwalt
82f4218c0d Cleanup the shutdown of BatchedScans. 
Fixes binder-death as well as disambiguation when an app has multiple requests in.

bug:10641931
Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
 2013-09-20 16:32:47 +00:00
John Spurlock
d4c2b67ea6 am 560d2e46: Merge "Include starting windows in the sysui vis calculation." into klp-dev 
* commit '560d2e463ed282badd1d069d60d98b59af3b880f':
  Include starting windows in the sysui vis calculation.
 2013-09-20 09:27:59 -07:00
John Spurlock
560d2e463e Merge "Include starting windows in the sysui vis calculation." into klp-dev 2013-09-20 16:25:30 +00:00
Scott Main
9bcea321af add custom head tag to verify developers@android.com as site owner 
Change-Id: I1a79669ab1e30de152354fafe5e397d5d1598f15
 2013-09-20 09:10:08 -07:00
John Spurlock
79da83347a Include starting windows in the sysui vis calculation. 
Sysui vis needs to be recomputed in the same code path as showing/
hiding the system bar (code path = finishPostLayoutPolicyLw) so
it can perform the new fade in/fade out to transparent modes at
the correct time.

Turns out no new state tracking is required, we already keep track
of this window as mTopFullscreenOpaqueWindowState.

So prefer mFocusedWindow when computing sysui vis as before,
but if null fallback to mTopFullscreenOpaqueWindowState.

Bug:10561554
Change-Id: I492766989a67fdac4f030451dcf00f6741a556c0
 2013-09-20 12:04:47 -04:00