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

151963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
ea3f59fd65 am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev 
* commit 'b5a27aee532343a3c66d91c04c8d238ff35b31db':
  Handle premultiplication correctly for ColorMatrixColorFilters
 2014-09-17 17:12:21 +00:00
Chris Craik
ba9d58516c Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev 2014-09-17 17:01:35 +00:00
Chris Craik
73821c8d2b Handle premultiplication correctly for ColorMatrixColorFilters 
bug:17405627

Previously, the input content to the color matrix computation was left
premultiplied. Since the color matrix could reduce the alpha channel,
the alpha was re-multiplied, but this was incomplete, and incorrect.

Instead, apply the color matrix in unpremultiplied space.

Change-Id: I87b8e03d2e228e6ded81f7bbfea952605d7a095c
 2014-09-17 10:00:34 -07:00
Esteban Talavera
e3665b7bdf am 62bdf3ea: Merge "Add \'adb dpm\' subcommand to set profile owner" into lmp-dev 
* commit '62bdf3ea21de9b9d8ecada58eb1d7f7838b94e2f':
  Add 'adb dpm' subcommand to set profile owner
 2014-09-17 15:44:29 +00:00
Esteban Talavera
63b328bdeb Merge "Add 'adb dpm' subcommand to set profile owner" into lmp-dev 2014-09-17 15:37:27 +00:00
Christoph Studer
fe12eaf06c am c93c4fd9: Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev 
* commit 'c93c4fd964680f49e4542c88ec6cdf4c7b925c91':
  SysUI: Add no-wallpaper recents theme for low GFX devices
 2014-09-17 14:56:17 +00:00
Christoph Studer
9077cbc30e Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev 2014-09-17 14:17:33 +00:00
Alexandra Gherghina
38c6ef9624 am 5ec57688: Merge "Reorder user icon colors so that the first default is teal" into lmp-dev 
* commit '5ec5768864e9a9dfc4dac4d0afe2f0593b070d08':
  Reorder user icon colors so that the first default is teal
 2014-09-17 12:01:27 +00:00
Alexandra Gherghina
16ebe98d9a Merge "Reorder user icon colors so that the first default is teal" into lmp-dev 2014-09-17 11:49:29 +00:00
Christoph Studer
37e4468be1 SysUI: Add no-wallpaper recents theme for low GFX devices 
Also add a config flag to control the theme to apply to RecentsActivity.

Bug: 17522143
Change-Id: I8d03e84e37b77698243673f6c4e676b2c53e0d07
 2014-09-17 13:28:46 +02:00
Yorke Lee
9c412fb140 am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference 
* commit 'b23e025aab63b2318a5fb711433f51720e8c400b':
  Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
 2014-09-17 04:25:58 +00:00
Yorke Lee
58bacc513c Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference 
Bug: 17512380
Change-Id: Ie26bef643bdec97f64247b5f8099f2676ae6c63e
 2014-09-16 20:44:09 -07:00
Yorke Lee
edac2c611b am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev 
* commit '44b693a3cdee9908223723e961a29fbfc0305163':
  Add missing methods to Conference object
 2014-09-17 03:41:10 +00:00
Nancy Chen
68e3e27a1e am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 
* commit '05a2c7ef905777fdbc1129146df6f389e2e6980a':
  Remove ability to enable/disable phoneaccounts (1/6)
 2014-09-17 03:41:02 +00:00
Yorke Lee
1c4eb10cc1 Merge "Add missing methods to Conference object" into lmp-dev 2014-09-17 03:29:12 +00:00
Nancy Chen
ebc69cd19e Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 2014-09-17 03:23:04 +00:00
Andrew Lee
a2a62e4161 am 9feb839b: Merge "Fix disconnect log printf in ConnectionService." into lmp-dev 
* commit '9feb839b7d77654dc7598b5c2f85aaa06be81e9d':
  Fix disconnect log printf in ConnectionService.
 2014-09-17 02:00:31 +00:00
Andrew Lee
009348e837 Merge "Fix disconnect log printf in ConnectionService." into lmp-dev 2014-09-17 01:52:54 +00:00
Jungshik Jang
8210ad6f85 am f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev 
* commit 'f88be2c79ab5cb980fee2fff22c41d62100f4165':
  Adjust volume bar visibility in HDMI-CEC system audio mode
 2014-09-17 01:38:25 +00:00
Yuncheol Heo
09097a13d1 am 41f887c4: Merge "Remove MHL related code." into lmp-dev 
* commit '41f887c4620cb33041b2844314770c56605d2679':
  Remove MHL related code.
 2014-09-17 01:38:21 +00:00
mike dooley
4b57a89597 am c7932a06: Merge "Fix a small printf format bug." into lmp-dev 
* commit 'c7932a06f76db95a44163d1feb68dcc8af411627':
  Fix a small printf format bug.
 2014-09-17 01:38:15 +00:00
Jungshik Jang
c1e1550bf4 Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev 2014-09-17 01:29:54 +00:00
Jungshik Jang
1a6be6ed39 Adjust volume bar visibility in HDMI-CEC system audio mode 
When HDMI-CEC system audio mode is activated.
1. Hide volume bar when volume button is pressed in TV
2. Show volume bar when TV receives volume notification from
   Audio Receiver.

Otherwise, (system audio mode off) follows normal TV's behavior.

Bug: 17347499

Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
 2014-09-17 10:28:40 +09:00
Yuncheol Heo
afd6f342ad Merge "Remove MHL related code." into lmp-dev 2014-09-17 01:28:26 +00:00
mike dooley
9891bbeae2 Merge "Fix a small printf format bug." into lmp-dev 2014-09-17 01:25:14 +00:00
Andrew Lee
2678639f9e Fix disconnect log printf in ConnectionService. 
Bug: 17534940
Change-Id: I41499701d1f7a3ab0816624d27094c6c86fb5b01
 2014-09-16 18:17:44 -07:00
Yuncheol Heo
da6e9f10d0 Remove MHL related code. 
Bug: 17479050
Change-Id: Id4a76ccf7325c78817d1b3c3460e5dc40e23831b
 2014-09-17 10:15:40 +09:00
mike dooley
f34519b4dd Fix a small printf format bug. 
Bug: 17534940
Change-Id: Idc3c1105c72714f138b07012d0ad9e0bf0ba17f1
 2014-09-16 18:14:14 -07:00
Dianne Hackborn
e55039dc96 am 3061d2b9: Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into lmp-dev 
* commit '3061d2b984eed5b9e2d60748cea0a111ba52c758':
  Fix issue #17507017: took ~3 seconds to move an app to the foreground
 2014-09-17 00:21:04 +00:00
Dianne Hackborn
d3f69e7d80 am 1a7cb969: Merge "Fix issue #16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev 
* commit '1a7cb969b833be16632cbcadc498a1fb978ca659':
  Fix issue #16662560: SingleTop activity is getting instantiated multiple time
 2014-09-17 00:21:00 +00:00
Dianne Hackborn
6035379865 Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into lmp-dev 2014-09-17 00:14:44 +00:00
Robert Greenwalt
9e1d9f0fb2 am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:13:54 +00:00
Dianne Hackborn
1a526f582b Merge "Fix issue #16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev 2014-09-17 00:13:38 +00:00
Robert Greenwalt
e7b26be378 Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 2014-09-17 00:06:03 +00:00
Robert Greenwalt
e73cc4646b Add NetworkAgent event for ExplicitlySelected 
Lets Wifi tell us when the user selected this AP vs auto-connected.

bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
 2014-09-16 17:03:59 -07:00
Adrian Roos
d804482660 am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-16 23:58:07 +00:00
Brian Attwell
598c4f9329 am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:45:03 +00:00
Adrian Roos
543f21da46 Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 2014-09-16 23:42:40 +00:00
Brian Attwell
5665c0f265 Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 2014-09-16 23:33:24 +00:00
Alan Viverette
56debf9a14 am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit '67798394819f1b8af9afb8f35fda0d0f0552f027':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-16 23:30:54 +00:00
Alan Viverette
e748ca5dc9 am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '07e867a059a6bef19fb92663d02a03a90cd356e8':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:30:50 +00:00
Alan Viverette
6acb495af2 am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit '37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:30:46 +00:00
ztenghui
c209535d5e am 0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 
* commit '0fed84e1e4674353892143103ba0ebdf36b0c71d':
  Update the progress bar to square instead of round lineCap
 2014-09-16 23:30:42 +00:00
Alan Viverette
af8e823d99 Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 2014-09-16 23:25:07 +00:00
Alan Viverette
4813482324 Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 2014-09-16 23:23:23 +00:00
Dianne Hackborn
7922882189 Fix issue #16662560: SingleTop activity is getting instantiated multiple time 
Introduce a concept of a "root affinity" to a task -- this is the
affinity of the initial activity in the task.  Use this instead of
the current affinity in findTaskLocked(), where we look for an
existing task to use for a NEW_TASK intent.

This changes the semantics of the new "relinquish task identity" mode
so that it doesn't relinquish the root affinity of the task.  This
means when we are in the old style application-based recents matching
of findTaskLocked(), we will never count these tasks as the same as
the application's tasks only because they have relinquished their
identity to that application.  This is probably okay, it is basically
putting a different line between new document-centric recents and
old application-centric recents when they are mixed together.

Change-Id: I73a22ead9bd08e98bf67ad035a017f828c6a6715
 2014-09-16 16:22:55 -07:00
Alan Viverette
96f26b8039 Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 2014-09-16 23:20:28 +00:00
ztenghui
f74879fb4d Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 2014-09-16 23:18:37 +00:00
Robert Greenwalt
9d1723558b am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'c8f6ad366accbe6bf90d30d4e2d4f924552d731a':
  Report Network status to NetworkAgent.
 2014-09-16 23:05:35 +00:00
Craig Mautner
ea0dbf3fa2 am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
 2014-09-16 23:00:11 +00:00