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

128065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
7caa77e3ab am 79d88d13: am 73e78c75: am af42a91c: Fix another build breakage. 
* commit '79d88d138c07835d349f7c74f380eaeb7cac8d0b':
  Fix another build breakage.
 2014-04-11 11:41:42 +00:00
Narayan Kamath
79d88d138c am 73e78c75: am af42a91c: Fix another build breakage. 
* commit '73e78c75b770b3af0d48acac9c8565f7b4d035ff':
  Fix another build breakage.
 2014-04-11 11:37:40 +00:00
Narayan Kamath
73e78c75b7 am af42a91c: Fix another build breakage. 
* commit 'af42a91c118941d463b474574bf34bf05822350d':
  Fix another build breakage.
 2014-04-11 11:35:19 +00:00
Narayan Kamath
af42a91c11 Fix another build breakage. 
Caused by 037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.

Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
 2014-04-11 11:31:07 +00:00
Narayan Kamath
70ef7810a4 am 629f7668: am 80edaa67: am 24c089a8: Fix build. 
* commit '629f76682729a63c0e3d29f836c3c69c6fdb4c77':
  Fix build.
 2014-04-11 10:59:57 +00:00
Narayan Kamath
629f766827 am 80edaa67: am 24c089a8: Fix build. 
* commit '80edaa676bd59409f8a82e12c035bee96e653004':
  Fix build.
 2014-04-11 10:57:28 +00:00
Narayan Kamath
80edaa676b am 24c089a8: Fix build. 
* commit '24c089a8b5871b331441d0858aa164364b7737cb':
  Fix build.
 2014-04-11 10:54:20 +00:00
Narayan Kamath
24c089a8b5 Fix build. 
isScreenOn was changed to isInteractive.

Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
 2014-04-11 10:50:43 +00:00
Narayan Kamath
785f44a4dc am 26ad3af7: am c3255ae0: am de442781: am 909a6a0e: Merge "Dual zygote cleanup." 
* commit '26ad3af74d4b8a6f960de7a4370684a987551f6d':
  Dual zygote cleanup.
 2014-04-11 10:06:29 +00:00
Narayan Kamath
26ad3af74d am c3255ae0: am de442781: am 909a6a0e: Merge "Dual zygote cleanup." 
* commit 'c3255ae04c8bec36f6701b92bf645323558e23c1':
  Dual zygote cleanup.
 2014-04-11 10:02:17 +00:00
Narayan Kamath
c3255ae04c am de442781: am 909a6a0e: Merge "Dual zygote cleanup." 
* commit 'de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6':
  Dual zygote cleanup.
 2014-04-11 09:57:27 +00:00
Jinsuk Kim
aa77b11bdb am 4bdcd299: am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit '4bdcd299da48f9abe5f9c67abed0dbe79080445d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:47:11 +00:00
Jinsuk Kim
4bdcd299da am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit '55dab4dd3b5b56ade91c012d688b581b6cbdebdf':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:43:37 +00:00
Jinsuk Kim
55dab4dd3b am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit 'b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:40:46 +00:00
Mikhail Naganov
a0c7d3545d am b429088c: Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat." 
* commit 'b429088cbb12a226fd217f04870d16bbd833ed06':
  Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat.
 2014-04-11 09:39:54 +00:00
Jinsuk Kim
b11f250e09 Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 2014-04-11 09:38:23 +00:00
Mikhail Naganov
b429088cbb Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat." 2014-04-11 09:36:39 +00:00
Jinsuk Kim
61791075f4 Delegate HdmiCecService method impl to HdmiCecDevice subclass 
Most of the methods in the interface IHdmiCecService should be implemented
based on the device type. This CL makes a change such that the HdmiCecDevice
just has stub methods that should be overriden by subclasses.

Other changes:
  - Fixed a bug of <Inactive Source> not sending its physical address
    in its message body. Also the command should have been sent to TV
    only rather than broadcast.

  - Put back sendGiveDevicePowerStatus interface method. It allows the client
    to keep track of the other device(like TV) power status more closely.
    Devices goes through the status from standby -> transient to on -> on
    but the CEC spec doesn't require that they broacast it actively.

    The restored method can be used to let the playback device to get
    up-to-date power status of TV/display when it is booting up.

    This method should work the same across all the device types. So it was
    implemented in the service, not delegated to HdmiCecDevice.

  - Send <Report Physical Address> when a new logical device is registered,
    which is required by CEC spec: "it should report the association between
    its logical and physical address by broadcasting <Report Physical
    Address>

Change-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63
 2014-04-11 18:35:01 +09:00
Jeff Brown
861aa0073a am 26c6a50f: Rename isScreenOn() to isInteractive(). 
* commit '26c6a50f037c6af9c41b3f96269fe194748605ce':
  Rename isScreenOn() to isInteractive().
 2014-04-11 09:24:24 +00:00
Jeff Brown
26c6a50f03 Rename isScreenOn() to isInteractive(). 
Fix build break due to an earlier merge.

Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
 2014-04-11 02:15:54 -07:00
Mikhail Naganov
d380b2098f Add Javadoc statement regarding enumerability of methods of injected Java 
objects for applications targeted to API levels after KitKat.

Bug: 12169386
Change-Id: I1c988468545e48ac0d7323b01b9c77a1f8d713f2
 2014-04-11 10:04:18 +01:00
Jeff Brown
858737d08d resolved conflicts for merge of 4e5c089e to master-lockscreen-dev 
Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1
 2014-04-11 01:47:08 -07:00
Narayan Kamath
de442781cd am 909a6a0e: Merge "Dual zygote cleanup." 
* commit '909a6a0e2b5815332618b2cf731d27824a76d042':
  Dual zygote cleanup.
 2014-04-11 08:45:47 +00:00
Jeff Brown
4e5c089ef3 resolved conflicts for merge of 337e764d to master 
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
 2014-04-11 01:33:20 -07:00
Narayan Kamath
909a6a0e2b Merge "Dual zygote cleanup." 2014-04-11 08:24:52 +00:00
Colin Cross
d4d4658766 resolved conflicts for merge of 90b39aba to master-lockscreen-dev 
Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b
 2014-04-10 22:41:05 -07:00
Colin Cross
90b39abaf9 Merge "fix build" 2014-04-11 05:16:12 +00:00
Colin Cross
0b65c56eb0 fix build 
Fix make checkbuild.

Change-Id: Ie9335a9e8afe4dc13ec47b2e84ab433b19ff315f
 2014-04-10 22:05:57 -07:00
Jeff Brown
337e764deb am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev 
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
  Plumb display power state through display manager.
 2014-04-11 03:49:37 +00:00
Jeff Brown
f24687e273 Merge "Plumb display power state through display manager." into klp-modular-dev 2014-04-11 03:47:08 +00:00
Jeff Brown
037c33eae7 Plumb display power state through display manager. 
Declare a new method, Display.getState() to retrieve the actual
power state of a display.

Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.

Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.

Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.

Eliminated the bright here and woke here policy flags since they
were unused.  Simplified the input dispatch policy somewhat.

Ensure that screen wake locks are respected up until the point
when dozing really begins.

Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.

Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
 2014-04-10 20:46:14 -07:00
Alan Viverette
923914bc5b am eed2be4e: Merge "Fix support for TouchFeedbackDrawable tint mode" 
* commit 'eed2be4eab2b43618bd5e89c4a228b9988af8c65':
  Fix support for TouchFeedbackDrawable tint mode
 2014-04-11 02:57:03 +00:00
Alan Viverette
eed2be4eab Merge "Fix support for TouchFeedbackDrawable tint mode" 2014-04-11 02:55:31 +00:00
Sungsoo Lim
bd35c5f4d2 am f0e74f08: Merge "Add equals, hashCode, and toString methods in TvInputInfo." 
* commit 'f0e74f08a1a11a6d7bb25f34350ff996716036a1':
  Add equals, hashCode, and toString methods in TvInputInfo.
 2014-04-11 02:29:46 +00:00
Alan Viverette
d30688f0a0 Fix support for TouchFeedbackDrawable tint mode 
Change-Id: I86bff1c5e69d9a193deb52559948b20ddca99751
 2014-04-10 19:27:58 -07:00
Sungsoo Lim
f0e74f08a1 Merge "Add equals, hashCode, and toString methods in TvInputInfo." 2014-04-11 02:27:21 +00:00
Sungsoo Lim
89978abd98 Add equals, hashCode, and toString methods in TvInputInfo. 
Change-Id: I770e0eeac334d2c0b98ef0941bc9840296360e4f
 2014-04-11 11:24:26 +09:00
Alan Viverette
3b5f8522f7 am 494fb7b5: Update volume panel 
* commit '494fb7b58a21a7a9a8eba3bacecffe115edcb8c6':
  Update volume panel
 2014-04-11 01:16:17 +00:00
Alan Viverette
494fb7b58a Update volume panel 
Change-Id: I6f0887069598f8addc5c5af5aef9c07a69532424
 2014-04-10 18:13:08 -07:00
Amith Yamasani
f781a9b6d8 am c095ca1c: Merge "Corp badging for Recents" 
* commit 'c095ca1cb8877121f768b5b6940e4025e810d4ba':
  Corp badging for Recents
 2014-04-11 00:33:44 +00:00
Amith Yamasani
c095ca1cb8 Merge "Corp badging for Recents" 2014-04-11 00:30:35 +00:00
Amith Yamasani
4f0a49e6b9 Corp badging for Recents 
Badge apps that belong to the corp profile when shown in the recents list.

Add a userId to TaskKey to help with caching.

Bug: 11676348

Change-Id: I92c8262dce763de89497977fcc6a53899afda136
 2014-04-10 17:27:12 -07:00
Zhijun He
94d3f30ec3 am 438d77e0: MediaFrameworkTest: Fix Camera2 API unit test build breakage 
* commit '438d77e0429f78def6c0cb3c21095202c71b8220':
  MediaFrameworkTest: Fix Camera2 API unit test build breakage
 2014-04-11 00:15:12 +00:00
Zhijun He
438d77e042 MediaFrameworkTest: Fix Camera2 API unit test build breakage 
Change-Id: I49329e2c3bbf1290f1f6e7c64dbb56eb831e5a96
 2014-04-10 17:09:22 -07:00
Adrian Roos
58aae51102 Merge "Set a dark theme for SystemUI." into master-lockscreen-dev 2014-04-10 23:43:22 +00:00
Adrian Roos
070a0b61cd Set a dark theme for SystemUI. 
The default theme for the platform has changed to a
light variant. This puts SystemUI back in the dark.

Bug: 13635952
Change-Id: I230a2078ba6bf5a79c768f0e357fcbd75f283cf8
 2014-04-11 01:36:33 +02:00
Alan Viverette
55e41ea6df am 316e533a: Merge "Update brightness icons to use color attribute" 
* commit '316e533ab0ac9888af9e6c3db44e886dd50312e1':
  Update brightness icons to use color attribute
 2014-04-10 23:17:50 +00:00
Alan Viverette
316e533ab0 Merge "Update brightness icons to use color attribute" 2014-04-10 23:15:45 +00:00
Alan Viverette
515a48a018 Update brightness icons to use color attribute 
BUG: 13961573
Change-Id: I6c7f85c8cda739cb1e5e14c39c7e4a9fe20a8650
 2014-04-10 16:14:40 -07:00
Jean-Michel Trivi
b2fb69f42b am cf3f3c27: Merge "MediaFocusControl: fix comment" 
* commit 'cf3f3c27364cf82619e50436f3f9d308dc669229':
  MediaFocusControl: fix comment
 2014-04-10 23:14:07 +00:00