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

153123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
ac081aa9ad am 8db0a171: Merge "Fix issue #16366571: UIDs for work and normal Chrome processes are the same" into lmp-dev 
* commit '8db0a171e290af8fdaf458ff0782d5f756b3024e':
  Fix issue #16366571: UIDs for work and normal Chrome processes are the same
 2014-08-25 23:28:49 +00:00
Chris Craik
366b4234ea Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev 2014-08-25 23:26:19 +00:00
Alan Viverette
042a0cee90 am 20862a7f: Merge "Update material colors" into lmp-dev 
* commit '20862a7fe43f05b12a6f95515ab08ae0bffb1bae':
  Update material colors
 2014-08-25 23:23:33 +00:00
Robert Greenwalt
b0b823db53 am 298b8237: Merge "Remove listen requests properly." into lmp-dev 
* commit '298b823791d0d192742edab6840fc95d075b7a6e':
  Remove listen requests properly.
 2014-08-25 23:23:28 +00:00
Dianne Hackborn
4cce1de9fe Merge "Fix issue #16366571: UIDs for work and normal Chrome processes are the same" into lmp-dev 2014-08-25 23:21:48 +00:00
Alan Viverette
83a82983eb Merge "Update material colors" into lmp-dev 2014-08-25 23:18:16 +00:00
Alan Viverette
a1fe772bd7 Update material colors 
BUG: 17212898
Change-Id: Ic0806db57e88d5143b4241e419970ffeb2468d50
 2014-08-25 16:15:06 -07:00
Robert Greenwalt
739d6dbf9b Merge "Remove listen requests properly." into lmp-dev 2014-08-25 23:12:46 +00:00
Alan Viverette
ff4ef85cf2 am 14c8a3b4: Merge "Revert "Update shadow parameters for television."" into lmp-dev 
* commit '14c8a3b4e41511a25b3088739ff0305b3a88b1b3':
  Revert "Update shadow parameters for television."
 2014-08-25 23:06:44 +00:00
Alan Viverette
9e05f91cee Merge "Revert "Update shadow parameters for television."" into lmp-dev 2014-08-25 22:55:05 +00:00
Robert Greenwalt
4456cf3ff0 Remove listen requests properly. 
https://googleplex-android-review.googlesource.com/#/c/527772/
correctly stopped adding listen requests to the mNetworkForRequestId
sparse array, but when we remove requests, if it's not getting
serviced by a network, we don't remove it from the network.  That
means that when we go to send a notification for that network we have
a request affiliated with the network, but don't have data for the
request and hit this NPE.

If it's not a request, don't do the optimization and remove it only
from the network servicing the request, but instead scan all networks
and remove it from each, if found.

bug:17239054
Change-Id: I49165ed08c224ef20f703469f9ce39df5f21b163
 2014-08-25 15:42:10 -07:00
Tim Murray
003c91df3e am be744e83: Merge "Update RenderScript docs." into lmp-dev 
* commit 'be744e832a12918ef7eaca81519176dc0806839f':
  Update RenderScript docs.
 2014-08-25 22:41:35 +00:00
John Spurlock
4bd7b56bc4 am a60bba8d: Merge "QS: Wire up screen casting to tile/panel." into lmp-dev 
* commit 'a60bba8d96e4c6a3c526fe047533f4fdca1e51db':
  QS: Wire up screen casting to tile/panel.
 2014-08-25 22:41:30 +00:00
Nancy Chen
df4c1fc1e4 am f9317703: Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 
* commit 'f93177032fa01dab1d1e60c610ddbae50cd5d93d':
  API review PhoneManager -> TelecommManager. Rename methods (6/6)
 2014-08-25 22:41:21 +00:00
Tim Murray
1df3f99d2d Merge "Update RenderScript docs." into lmp-dev 2014-08-25 22:35:58 +00:00
Chris Craik
8afd0f245c Create z reordering boundaries around dispatchDraw 
bug:16012254

This means rendernodes with a Z will no longer be drawn at the end of
their parent's DisplayList, but at the end of the associated reorder
region (DisplayListData::Chunk).

Change-Id: Ia033fee9d9a4db567b2a8d5e90fc57a4d0a64544
 2014-08-25 15:35:40 -07:00
John Spurlock
d38eeb5512 Merge "QS: Wire up screen casting to tile/panel." into lmp-dev 2014-08-25 22:35:25 +00:00
Alan Viverette
f707774ae1 Revert "Update shadow parameters for television." 
Missing several important values, plus we're changing the
styling attributes so this would break anyway.

This reverts commit 97fe804398a3c6c3f7bd888f7c0129f1c130bb00.

BUG: 17221975
Change-Id: I3b4a712ca21f3821ecadfc6c9d91b604f7154f0e
 2014-08-25 22:32:14 +00:00
John Reck
c1469f39b5 DO NOT MERGE Copy shaders 
Bug: 16733996

Change-Id: I84afc1b24a23dd6ddf5ab48fb2bfcbe779f8d3e3
 2014-08-25 15:27:11 -07:00
Nancy Chen
e4b1d57dfd Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 2014-08-25 22:24:09 +00:00
Baligh Uddin
77e2a102b3 am f4870da9: (-s ours) am 00e4b6c5: (-s ours) am b48db445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'f4870da9a131fa1a038be256cca66d6b6b80c401':
  Import translations. DO NOT MERGE
 2014-08-25 22:24:07 +00:00
Baligh Uddin
d081836964 am 6f60ce4e: (-s ours) am 7fbc5ae8: (-s ours) am 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '6f60ce4ee061cb07fbee74da9ed13ec48cfb9cc9':
  Import translations. DO NOT MERGE
 2014-08-25 22:23:57 +00:00
Baligh Uddin
92ef7bc902 am fcc60692: (-s ours) am d12be991: (-s ours) am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'fcc606922944bbc4e5e55b96eec5e0565f10b710':
  Import translations. DO NOT MERGE
 2014-08-25 22:23:52 +00:00
Baligh Uddin
104a786e2b am 9a828f39: (-s ours) am 33a062f2: (-s ours) am 7da569a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '9a828f39c8071d16c7f52ad80257628f684aa45d':
  Import translations. DO NOT MERGE
 2014-08-25 22:23:48 +00:00
Aravind Akella
0da06066c9 am ac053f4d: am 303df3b6: am 765c08fd: am 611dea81: Step Counter documentation fix. 
* commit 'ac053f4d50feb395bdd9d9f11e5ee3f436a0785f':
  Step Counter documentation fix.
 2014-08-25 22:23:45 +00:00
Baligh Uddin
314eef0015 am d6c47252: (-s ours) am 90a7cbba: (-s ours) am d6c7fd28: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd6c47252efb82f5234abd83378e4348a3aa09ce2':
  Import translations. DO NOT MERGE
 2014-08-25 22:23:41 +00:00
Baligh Uddin
00c2f99e9d am 6e90ac85: (-s ours) am c60170b9: (-s ours) am b3024901: (-s ours) Import translations. DO NOT MERGE 
* commit '6e90ac858d0bfdde6e1c97d1e0128279ef7ee53c':
  Import translations. DO NOT MERGE
 2014-08-25 22:23:37 +00:00
Quddus Chong
5db688cfec am bcde0bd3: am 9893c642: am f42fdfd9: am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs 
* commit 'bcde0bd323699feee4ab07fc0c0d856448b3b985':
  docs: Added additional documentation for specifying OAuth scopes. bug: 12650251
 2014-08-25 22:23:32 +00:00
Baligh Uddin
5480b3746a am 00e4b6c5: (-s ours) am b48db445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '00e4b6c50af5d6cb38d0e0dd21e14624d65e109d':
  Import translations. DO NOT MERGE
 2014-08-25 22:07:59 +00:00
Baligh Uddin
5a292604eb am 7fbc5ae8: (-s ours) am 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7fbc5ae88515362f41ff382d8e614e1225787183':
  Import translations. DO NOT MERGE
 2014-08-25 22:07:50 +00:00
Baligh Uddin
d15d5c8bd4 am d12be991: (-s ours) am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd12be991afdaa80a556273e5ad91db2a824002c8':
  Import translations. DO NOT MERGE
 2014-08-25 22:07:44 +00:00
Baligh Uddin
63cdabda89 am 33a062f2: (-s ours) am 7da569a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '33a062f209823a26fbc868801ba2250f331340f6':
  Import translations. DO NOT MERGE
 2014-08-25 22:07:40 +00:00
Aravind Akella
01a83089b7 am 303df3b6: am 765c08fd: am 611dea81: Step Counter documentation fix. 
* commit '303df3b6ae4f6bac58012d5f14c9b764e944709b':
  Step Counter documentation fix.
 2014-08-25 22:07:33 +00:00
Baligh Uddin
4d4093aa12 am 90a7cbba: (-s ours) am d6c7fd28: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '90a7cbba0e9b437d4dffc1e03b2d17669a31c1b1':
  Import translations. DO NOT MERGE
 2014-08-25 22:07:28 +00:00
Baligh Uddin
db88184dce am c60170b9: (-s ours) am b3024901: (-s ours) Import translations. DO NOT MERGE 
* commit 'c60170b96f6020f0bb501b57bd5890fbc7079ad3':
  Import translations. DO NOT MERGE
 2014-08-25 22:07:24 +00:00
Quddus Chong
b9fc2b4fc7 am 9893c642: am f42fdfd9: am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs 
* commit '9893c6420d0a127b3a3769a1deb2a8d397267e9b':
  docs: Added additional documentation for specifying OAuth scopes. bug: 12650251
 2014-08-25 22:06:39 +00:00
John Spurlock
78b8c8fbde QS: Wire up screen casting to tile/panel. 
Use MediaProjectionManager to determine whether or not
screencasting is active, when it changes, and to stop
casting.

Also:
 - Implement hashCode/equals on MediaProjectionInfo
 - Fix unintentional recursion in the service.

Bug:16488053
Change-Id: Icd1a88f23bbdf1d4c1915b30cb2508f8fe9d6d7e
 2014-08-25 17:55:08 -04:00
Amith Yamasani
b301589654 am c4079557: Merge "Improve user switching interstitial" into lmp-dev 
* commit 'c40795579d27568267e8e0450bb3651f377c3f59':
  Improve user switching interstitial
 2014-08-25 21:52:18 +00:00
Adam Lesinski
e3dcf48b6b am 874d4c00: Merge "PM: Load all splits when parsing an app manifest" into lmp-dev 
* commit '874d4c0077a3cfd0f65791a32288a94bf05c7a87':
  PM: Load all splits when parsing an app manifest
 2014-08-25 21:52:14 +00:00
Amith Yamasani
5b8e5a7d4c Merge "Improve user switching interstitial" into lmp-dev 2014-08-25 21:43:32 +00:00
Adam Lesinski
6b2416492e Merge "PM: Load all splits when parsing an app manifest" into lmp-dev 2014-08-25 21:41:22 +00:00
Craig Mautner
3b2cd1d59f Update API per council requests 
launchTaskBehindBackgroundAnimation => launchTaskBehindTargetAnimation
visibilityMode => transitionVisiblityMode
makeLaunchTaskBehindAnimation => makeTaskLaunchBehind
launch_task_behind_background = launch_task_behind_target

Fixes bug 16958544.

Change-Id: I3b7c791fc0671b8071a5377cf6fa878bd5861f70
 2014-08-25 14:25:54 -07:00
Amith Yamasani
c2a8d151dc Improve user switching interstitial 
Layout and string changes.

Bug: 16661752
Change-Id: Ie24fe4683b91923ff357be054b7440fd1fc86ebb
 2014-08-25 14:20:20 -07:00
RoboErik
22a4e8f248 am 936b1894: Merge "Ensure current volume is current" into lmp-dev 
* commit '936b18946a10f265f9ea0f54c83cf65f9a159d84':
  Ensure current volume is current
 2014-08-25 20:29:00 +00:00
RoboErik
cc3e5d5cd1 Merge "Ensure current volume is current" into lmp-dev 2014-08-25 20:20:54 +00:00
John Spurlock
2acbbef88f am f51ee90a: Merge "PowerUI: Don\'t play sound on every update below level." into lmp-dev 
* commit 'f51ee90a8c5029b88980a6a5469e47d680dcdf33':
  PowerUI: Don't play sound on every update below level.
 2014-08-25 20:09:27 +00:00
John Spurlock
faa9fb8b6a Merge "PowerUI: Don't play sound on every update below level." into lmp-dev 2014-08-25 20:00:01 +00:00
Ruben Brunk
d70132c373 camera2: Fix number of DNG NoiseProfile coeffs. 
Bug: 16369384
Change-Id: I3ceca5ed3489120664990c0d057e6537b357c788
 2014-08-25 12:58:13 -07:00
John Spurlock
7290d192c8 PowerUI: Don't play sound on every update below level. 
There are many paths to update the power notification.  Use
PowerUI's playSound as a tripwire, and reset the value once applied.

Bug:17253062
Change-Id: Ica6a4c621f7047f8b52dee82cbfe1db5bc08247e
 2014-08-25 15:45:43 -04:00
Michael Wright
83e2d1a242 am 11bf90d8: Merge "Remove Meta-Tab shortcut for Recents." into lmp-dev 
* commit '11bf90d8a042a88e20b9057fa17bb5d53deb4da0':
  Remove Meta-Tab shortcut for Recents.
 2014-08-25 19:38:28 +00:00