Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,820 Commits 3 Branches 0 Tags
900beeb2eff12baba218d8414e8a35672d2160ec
Commit Graph

150820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
900beeb2ef am b379a6e9: Merge "Ambient shadow tessellation improvement." into lmp-dev 
* commit 'b379a6e93752b196a6dff9e4f081f1702f96fab2':
  Ambient shadow tessellation improvement.
 2014-08-29 23:34:03 +00:00
Dianne Hackborn
020087332d am 8eec555a: Merge "Fix issue #17329290: NPE during ContentProviderRecord.dump()" into lmp-dev 
* commit '8eec555a07e0bc01952281dcc20c1158543d4878':
  Fix issue #17329290: NPE during ContentProviderRecord.dump()
 2014-08-29 23:33:57 +00:00
Scott Rowe
9e8c59a844 am 526b7932: am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit '526b793275f626176fedaf1b08bc05b7d08b4ae1':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 23:33:53 +00:00
Chris Wren
3cdfa64906 am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit '7d0a2a7f7d0e87fa76dbf7c29b91a9ce4331b733':
  Disable lockscreen notifications for secure users on upgrade.
 2014-08-29 23:33:48 +00:00
Winson Chung
f4e4a782d9 am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '82f0abc42920441dca10be57ba0287a1e7dd3a46':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-08-29 23:33:43 +00:00
Craig Mautner
55b2670aa5 am 6b792116: Merge "Don\'t use anim background for translucent windows" into lmp-dev 
* commit '6b792116998ff005d3293605a453fee95c4c83a1':
  Don't use anim background for translucent windows
 2014-08-29 23:33:39 +00:00
ztenghui
cbf4c08796 Merge "Ambient shadow tessellation improvement." into lmp-dev 2014-08-29 21:36:03 +00:00
Dianne Hackborn
b8708c01df Merge "Fix issue #17329290: NPE during ContentProviderRecord.dump()" into lmp-dev 2014-08-29 21:35:23 +00:00
Scott Rowe
0ae64a84af am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit '4d50fde5754b2f4a8350b79b42812100183175a4':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 21:33:11 +00:00
Chris Wren
4775109ec1 Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 2014-08-29 21:25:43 +00:00
Winson Chung
68245c074c Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 2014-08-29 21:25:43 +00:00
Scott Rowe
4d50fde575 am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit '6208e7b56080956ffc48ade8d0b0f038b901cb23':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 21:17:08 +00:00
Winson Chung
02d4927082 Workaround to prevent starting the same task from Recents twice. (Bug 17322903) 2014-08-29 21:14:32 +00:00
Scott Rowe
6208e7b560 am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit '1014b9aa491d4d7dd4d4fc2510e7b6e6b3b4654d':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 21:04:16 +00:00
Dianne Hackborn
3133c401cd Fix issue #17329290: NPE during ContentProviderRecord.dump() 
Don't NPE.

Change-Id: I5e59583e97b969b1739fc39a1520bd1930302313
 2014-08-29 13:59:11 -07:00
Scott Rowe
1014b9aa49 Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 2014-08-29 20:52:54 +00:00
Christoph Studer
00a868f0ca am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit '5a657b432a1074963484dd7df69c58576f052f07':
  NoMan: Allow listeners to specify notification trim
 2014-08-29 20:51:53 +00:00
Chris Wren
cd8f4f71fc Disable lockscreen notifications for secure users on upgrade. 
Add a notification for those users that teaches them how to re-enable
the notifications.

Bug: 15934899
Depends-On: Ie0bcc207c4f331def207e588bbad36b8986fe114
Change-Id: I4a169e268042cfcaa4ad80cdf205904f9c90e76d
 2014-08-29 20:49:36 +00:00
Craig Mautner
d627eac286 Merge "Don't use anim background for translucent windows" into lmp-dev 2014-08-29 20:45:08 +00:00
ztenghui
d5e8ade498 Ambient shadow tessellation improvement. 
Using the vertices, instead of ray casting for the triangulation.

This request a dynamic index buffer associated with vertex buffer,
so we update the VertexBuffer to support it.

The ambient shadow could be 3x-6x times faster for circle and rect now.

b/16712006
b/14257173

Change-Id: I2f22a8fe19bc59acee5c18e4a3a395acd5042a66
 2014-08-29 13:40:42 -07:00
Christoph Studer
78358b1788 Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 2014-08-29 20:37:50 +00:00
Sailesh Nepal
10dfe10472 am 5f4f3a36: Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 
* commit '5f4f3a36571c05ee13cead7296a0b1c6b5131f91':
  Make PhoneAccount.Builder constructor public
 2014-08-29 20:06:14 +00:00
George Mount
cca19b363b am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit '6e6a57c8da95074c5f2c784b8fda38578835025e':
  Add IDs for status and nav-bar backgrounds.
 2014-08-29 20:06:09 +00:00
Adam Lesinski
d0a1a796f5 am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '3335c1dcd1bde37dddbe95c45d64866ca2d31cf2':
  Make UsageStats API comply with API Council
 2014-08-29 20:06:04 +00:00
Sailesh Nepal
8fd8124911 Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 2014-08-29 20:01:59 +00:00
George Mount
d2334e669c Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 2014-08-29 19:59:59 +00:00
Adam Lesinski
e43abf49d2 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 19:58:02 +00:00
Adam Lesinski
de99f4a234 am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit 'b9095bacc3083610412757a50a2a1b4cea20f866':
  Clean up test allocations so real memory leaks are more visible
 2014-08-29 19:56:56 +00:00
Adam Lesinski
5e71b3fa90 am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit '247e8e84ec0cafcac7f5e686b68ff64cebf7272a':
  Revert "Make UsageStats API comply with API Council"
 2014-08-29 19:56:52 +00:00
Adam Lesinski
cc562a811d Make UsageStats API comply with API Council 
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
 2014-08-29 12:52:41 -07:00
Adam Lesinski
d06cd2b1bd Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 2014-08-29 19:43:30 +00:00
Adam Lesinski
25b09837d1 Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 2014-08-29 19:42:43 +00:00
Adam Lesinski
df77a40d40 Revert "Make UsageStats API comply with API Council" 
This reverts commit 3811dabe57a60e4729f67b6fdc7fbe91eb8b3e06.

Did not update current.txt

Change-Id: I93faccaf24570b1ce88ade37c00506c4a48a8a1d
 2014-08-29 19:34:09 +00:00
Adam Lesinski
d79e33379d Clean up test allocations so real memory leaks are more visible 
Change-Id: Ic405f08c8d8e3e7fc4e4a991671e980752c19899
 2014-08-29 12:29:31 -07:00
Adam Lesinski
fc66c98750 am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '84b95b6634be81d9368f13c38ab86d28f591c478':
  Make UsageStats API comply with API Council
 2014-08-29 19:06:29 +00:00
Adam Lesinski
a496b1a7f3 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 18:56:24 +00:00
Adam Lesinski
093c6fa595 am c169c888: Change platformBuildVersionCode to name in aapt dump badging 
* commit 'c169c888039536e5f2393b245465a6dc53c4c2aa':
  Change platformBuildVersionCode to name in aapt dump badging
 2014-08-29 18:48:51 +00:00
Adam Lesinski
5283faba4a Change platformBuildVersionCode to name in aapt dump badging 
Change-Id: Ie3972105b3f6a727682f91851f7a99b05bb28e1a
 2014-08-29 11:27:00 -07:00
Yin-Chia Yeh
74df3591a5 am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev 
* commit '4c99af79c66ce92bee559fd160df75d09cdb90ee':
  Camera2: Remove spurious warnings
 2014-08-29 18:09:32 +00:00
Igor Murashkin
d76275c4b3 am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 
* commit '0a843da82f421032af9b05447013d9aaf67f1fee':
  camera2: Implement TotalCaptureResult#getPartialResults
 2014-08-29 18:09:27 +00:00
John Reck
12bfad8dd9 am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit 'ff6feadefb5fa002a80fd70a5ae7b527f72eef5a':
  Listener callbacks ordering fixups
 2014-08-29 18:09:22 +00:00
Yin-Chia Yeh
3e294e9921 Merge "Camera2: Remove spurious warnings" into lmp-dev 2014-08-29 18:02:50 +00:00
Igor Murashkin
0d1227d8b9 Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 2014-08-29 18:00:39 +00:00
John Reck
7da70ed6a5 Merge "Listener callbacks ordering fixups" into lmp-dev 2014-08-29 17:59:24 +00:00
John Reck
4d2c47206a Listener callbacks ordering fixups 
Bug: 17228458
Bug: 17317816

Ensure that onStart is called prior to onCancel/onFinished if those
happen prior to the UI-thread handled start delay.

Ensure that onFinished is called if cancel/end is called

Change-Id: I23c16ea1c4f925d59d41ec5281d62dfc0c38595b
 2014-08-29 10:40:56 -07:00
Yin-Chia Yeh
d47699a47a Camera2: Remove spurious warnings 
It is valid if all compenents of a synthetic key are null.
Don't warn in that case.

Bug: 17300101

Change-Id: Ifacf2fb56d1272b33a2b1ae377a85c9011e22b24
 2014-08-29 17:39:30 +00:00
Nancy Chen
030d48364c am 70475de3: Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 
* commit '70475de32f0c323082610eb177d0f45b1697c3ee':
  Hide AIDL for RemoteServiceCallback in telecomm
 2014-08-29 17:21:42 +00:00
John Reck
eb50b8578d am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 
* commit '09a0c7c8d511b8600d2a062d96c0e816a2aee761':
  Free prefetched layers on TRIM_MEMORY
 2014-08-29 17:15:58 +00:00
Svetoslav
5e843ee6ac am 37f72488: Merge "Fix the global gesture to enable accessibility." into lmp-dev 
* commit '37f72488ecb7a978ccaa77f0b74956a399a755fc':
  Fix the global gesture to enable accessibility.
 2014-08-29 17:15:49 +00:00
Lorenzo Colitti
b4497fdc90 am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev 
* commit '8a44b09de35285f6f02430442a2a62a11563e366':
  Really remove NetworkBoundURLFactory.
 2014-08-29 17:15:44 +00:00