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

128209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fabrice Di Meglio
71b3975c8a Add toString() for SearchIndexableData and SearchIndexableResource 
Change-Id: Ie85e0382705e5edb4be50b32370212d470f172d9
 2014-04-10 19:24:15 -07: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
Aravind Akella
cd9a7bb3ba Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
This reverts commit 819239e5bec90ee3c861ac45fffac4a832a183a1.

Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
 2014-04-11 00:05:24 +00: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
Jean-Michel Trivi
cf3f3c2736 Merge "MediaFocusControl: fix comment" 2014-04-10 23:11:28 +00:00
Jorim Jaggi
262ef08eba Merge "Hide back button on keyguard and make it work for bouncer." into master-lockscreen-dev 2014-04-10 23:06:25 +00:00
Selim Cinek
397e411a77 Merge "Fix first child handling with GONE children." into master-lockscreen-dev 2014-04-10 22:58:19 +00:00
Jorim Jaggi
9f347ae27c Fix first child handling with GONE children. 
Bug: 13635952
Change-Id: I970f39a2a33d957f32d3290999fd007f0d323b3b
 2014-04-11 00:47:18 +02:00
ztenghui
3c14939126 am 8a5c99c9: Merge "Fix path interpretation on curves" 
* commit '8a5c99c9e91fc86875f3c11f621a9e8a50c5831b':
  Fix path interpretation on curves
 2014-04-10 22:43:43 +00:00
ztenghui
8a5c99c9e9 Merge "Fix path interpretation on curves" 2014-04-10 22:40:35 +00:00
Raph Levien
5520fba609 am 6d954bbd: Merge "Fix build breakage" 
* commit '6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56':
  Fix build breakage
 2014-04-10 22:29:34 +00:00
John Reck
c1776b1426 am 822bbb38: Merge "Make attachFunctor blocking" 
* commit '822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
  Make attachFunctor blocking
 2014-04-10 22:26:01 +00:00
Raph Levien
6d954bbdf5 Merge "Fix build breakage" 2014-04-10 22:24:55 +00:00
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
Raph Levien
3931949bc4 Fix build breakage 
A recent change to remove VectorDrawable methods from the public api
didn't run update-api. This should fix that build.

Change-Id: I4d86221f5ada96113f673def4b32985c6d60110a
 2014-04-10 15:15:29 -07:00
Jean-Michel Trivi
f51e113469 MediaFocusControl: fix comment 
Comment about role of audio focus isn't valid anymore.

Change-Id: I608d8cf9d5d9c4449384e2788e5eb5ea42c97eca
 2014-04-10 15:05:44 -07:00
John Reck
d3d8dafc2f Make attachFunctor blocking 
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
 2014-04-10 15:00:13 -07:00
Alan Viverette
8809f186ea am 4b1a7c20: Fix build breakage 
* commit '4b1a7c203d5e32c8b2dc7f4f54f28559ca31860a':
  Fix build breakage
 2014-04-10 21:36:32 +00:00
John Reck
f039afd192 am a47c3cc5: Merge "Remove sync flush" 
* commit 'a47c3cc5375777a9adbc0dba95e6f133541f8d28':
  Remove sync flush
 2014-04-10 21:36:29 +00:00
Jorim Jaggi
584a7aa62c resolved conflicts for merge of ff0978fd to master-lockscreen-dev 
Change-Id: I03881da30db8189005d50812e5528ed07cebd437
 2014-04-10 23:34:07 +02:00
Alan Viverette
4b1a7c203d Fix build breakage 
Change-Id: I73d9ff5f38986b7acf83b85c1989203f472bc5fd
 2014-04-10 14:28:30 -07:00