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

152975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christopher Tate
f973a7b171 Expand job scheduler dumpsys a bit 
Now it actually says what jobs are active.

Bug 17322886

Change-Id: I1a0fe0bf8d4cb2988cc89a11793981037157ee07
 2014-08-29 14:24:15 -07:00
RoboErik
cd74270da7 Document MediaSession.Callback.onMediaButtonEvent and add returns 
Documents the return value and makes sure it returns true where
appropriate.

bug:17289717
Change-Id: Ia831a7212b76e8434b745be70da2ed106fa01230
 2014-08-29 14:17:13 -07: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
Christoph Studer
50b8fcb1f0 am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit 'e63f3434de0adc3bc9505e954fc3d58b4f627074':
  NoMan: Allow listeners to specify notification trim
 2014-08-29 21:03:04 +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
Dianne Hackborn
2c924fb2c7 Fix issue #17329066: Crash in ActivityManager 
Change-Id: Ib59b7a8d65b3abece82bc58897e21600af4d73f5
 2014-08-29 13:56:45 -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
George Mount
f31d83ce70 Fix NPE in EnterTransitionCoordinator. 
Bug 17324730

Change-Id: I2a8c5a4b82a7a252d4ac2319a26f3610b8e358ac
 2014-08-29 13:32:20 -07:00
Sailesh Nepal
68548e1f66 am 50be1997: am 5f4f3a36: Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 
* commit '50be1997cceb2c0fef05a4034ba137773f5900a4':
  Make PhoneAccount.Builder constructor public
 2014-08-29 20:18:32 +00:00
George Mount
b41572ec69 am 45af21e8: am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit '45af21e8314b877b90ad35248821da869835205a':
  Add IDs for status and nav-bar backgrounds.
 2014-08-29 20:18:27 +00:00
Adam Lesinski
e466091f06 am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '81d63ef2f2249a3be896a6ca792aeb8e2faf50fb':
  Make UsageStats API comply with API Council
 2014-08-29 20:18:22 +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
Adam Lesinski
1ff88036da am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit '0f885328bc54e896d0f3cdf2faf25abaab95bece':
  Clean up test allocations so real memory leaks are more visible
 2014-08-29 20:05:19 +00:00
Adam Lesinski
d6fe30be04 am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit 'b616b94b63b91d17140a31ef65fa26cb261a67f4':
  Revert "Make UsageStats API comply with API Council"
 2014-08-29 20:05:14 +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
Alan Viverette
fdbb98e56d Fix disappearing ripple background, treat active ripple separately 
There is only a single background, and it did not correctly handle
enter() being called while exit() was busy animating. We now cancel
all animations when starting an enter or exit. Also separates the
active ripple from the list of animating (exiting) ripples.

BUG: 17042060
BUG: 17281011
Change-Id: I4d4e33560867c7c71c1bdb72b17d52d6fbd86f68
 2014-08-29 19:54:59 +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
d57e1cb644 am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit 'f5e3785e6fc2d4dcbc8ce72ad871a96421ca1f1d':
  Make UsageStats API comply with API Council
 2014-08-29 19:21:28 +00:00
Adam Lesinski
05f2119432 am 135fba7e: am c169c888: Change platformBuildVersionCode to name in aapt dump badging 
* commit '135fba7ecdf4bb697b004329c6070a2ef544d8e3':
  Change platformBuildVersionCode to name in aapt dump badging
 2014-08-29 19:07:34 +00:00
Yin-Chia Yeh
fc90ddcf92 am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev 
* commit 'b3ff5477cd4d72631551bac81c543ed74179eda3':
  Camera2: Remove spurious warnings
 2014-08-29 19:07:02 +00:00
Igor Murashkin
80bcba6413 am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 
* commit 'e24c71fd133ba2564e84b4d171689a48f37c070a':
  camera2: Implement TotalCaptureResult#getPartialResults
 2014-08-29 19:06:57 +00:00
John Reck
b46c52209f am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit '724fff2034e17c601a3787792f8fb73172862c18':
  Listener callbacks ordering fixups
 2014-08-29 19:06:53 +00: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
Nancy Chen
7e1ec4dfe1 am 67e97c84: am 70475de3: Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 
* commit '67e97c84f36b27cf233f3da359c7a158ec43c3e2':
  Hide AIDL for RemoteServiceCallback in telecomm
 2014-08-29 18:52:53 +00:00
John Reck
ecb8785efc am 1099d64b: am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 
* commit '1099d64b40f555da92a7aee56c55a20a6f5c24f8':
  Free prefetched layers on TRIM_MEMORY
 2014-08-29 18:52:48 +00:00
Svetoslav
5acf03c481 am 9f6c3630: am 37f72488: Merge "Fix the global gesture to enable accessibility." into lmp-dev 
* commit '9f6c36305e2dcb385b157fb3e85cac80193cabdb':
  Fix the global gesture to enable accessibility.
 2014-08-29 18:52:42 +00:00
Lorenzo Colitti
f97b6bfb21 am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev 
* commit '64e6f01ff36bdfd6ba58436c35701d68ad174790':
  Really remove NetworkBoundURLFactory.
 2014-08-29 18:52:37 +00:00
Selim Cinek
d87f226129 am c0121664: am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 
* commit 'c01216640b76f6511d2b3320f83eef14e74ecbfc':
  Increasing the delay for the volume warning dialog with talkback
 2014-08-29 18:52:32 +00:00
Jorim Jaggi
2e09793c2e am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 
* commit 'ddd6040dadfe56f5bc9809e436f4a75538296a38':
  Revert "Content description for padlock icon depending on state"
 2014-08-29 18:52:27 +00:00
Jorim Jaggi
0c91868065 am d2f9ac27: am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 
* commit 'd2f9ac2729876aa7eab211e9698d1035d2b2c623':
  Only dismiss Keyguard with space when screen is on
 2014-08-29 18:52:07 +00:00