Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,867 Commits 3 Branches 0 Tags
69eb2f830fb3ed438a7532ee13f784d3b656a67f
Commit Graph

133867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
69eb2f830f am 44dbef7e: Merge "Doc fix in TypeEvaluator method docs" 
* commit '44dbef7ea2082ad5ca7f6671d41c59ffd7d8cee1':
  Doc fix in TypeEvaluator method docs
 2014-05-07 00:23:33 +00:00
Chet Haase
5b37b5e51d Merge "Doc fix in TypeEvaluator method docs" 2014-05-07 00:18:43 +00:00
Chet Haase
5f9ea81c99 Doc fix in TypeEvaluator method docs 
Change-Id: Ie20ba820b0a3a6b8f0f6120dfcfc8bba6adf29b3
 2014-05-06 17:07:16 -07:00
Scott Main
20c2820437 am 6e9f95b2: am b5342f96: am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit '6e9f95b211ff26f2a33a4b0069aad7e8ebc6c4ad':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-07 00:05:58 +00:00
Scott Main
3b23c019cf am b5342f96: am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit 'b5342f965b19a053b093f554930893b91c2e763e':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-07 00:00:20 +00:00
Scott Main
b5342f965b am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit 'fe99729539c8e51ce13c88dd9c999a458032356a':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-06 23:57:08 +00:00
Scott Main
fe99729539 am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit '01dc133b35021878b9c7c45d862cacb2b7645a4d':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-06 23:53:22 +00:00
Scott Main
01dc133b35 am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit 'f1bc39b8ae9d63f3c7d89f3d07ec026c62de6e6e':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-06 23:50:27 +00:00
Winson Chung
1f45114626 am 45576e7d: Merge "Fixing regression in calculating which activities to apply recents values to." 
* commit '45576e7d06e12f8f48a3623fbc9162c0640502c0':
  Fixing regression in calculating which activities to apply recents values to.
 2014-05-06 23:50:13 +00:00
Winson Chung
5269a01c6d Merge "Fixing regression in calculating which activities to apply recents values to." 2014-05-06 23:46:00 +00:00
Scott Main
f1bc39b8ae fix code error. 
The data type was wrong, but it's actually not needed.

Change-Id: I50275fd16c72de42b75f24be6192ca974bd67488
 2014-05-06 16:34:30 -07:00
Glenn Kasten
d9ead65094 am acd554ab: Merge "Add AudioFormat.getBytesPerSample and use it" 
* commit 'acd554abffd5bdf46ff6b2606af90aaa519a7c08':
  Add AudioFormat.getBytesPerSample and use it
 2014-05-06 23:10:50 +00:00
Glenn Kasten
8547e7022e Merge "Add AudioFormat.getBytesPerSample and use it" 2014-05-06 23:09:07 +00:00
Winson Chung
3aeaebb6fc Fixing regression in calculating which activities to apply recents values to. 2014-05-06 15:44:36 -07:00
Kenny Root
dd3a144c3c am 1b9c2108: Unhide new SSL APIs 
* commit '1b9c2108e8fdd5344e3916259f9d1eb3d2227a50':
  Unhide new SSL APIs
 2014-05-06 22:11:24 +00:00
Kenny Root
2cfedd94b3 Unhide new SSL APIs 
Change-Id: Ic58d5571754f434bb8f72b09329e8803d4343ba2
 2014-05-06 15:00:45 -07:00
Zhijun He
c5694ab534 am 1bb5da95: Camera2: Add missing capture result tags 
* commit '1bb5da9543f941430c75e122c8d07a15fa6e2d9e':
  Camera2: Add missing capture result tags
 2014-05-06 21:52:07 +00:00
Zhijun He
379af01292 Camera2: Add missing capture result tags 
All capture request tags should be available in capture result.

Bug: 14059883
Change-Id: I0aa8d7341b14fbbd627b17eb316bb016ff1fc316
 2014-05-06 21:46:27 +00:00
Tim Kilbourn
129a431bc9 am e0d3c4ea: am 1a556b99: (-s ours) am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev 
* commit 'e0d3c4ea0add93b0922dd8f62a2ea2a20b85767c':
  DO NOT MERGE Hide banner manifest attribute.
 2014-05-06 21:31:06 +00:00
Tim Kilbourn
0652842400 am 1a556b99: (-s ours) am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev 
* commit '1a556b996156b71bdbb60f6f9cd7bd3e16947a4f':
  DO NOT MERGE Hide banner manifest attribute.
 2014-05-06 21:26:56 +00:00
Tim Kilbourn
1a556b9961 am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev 
* commit '17c5e990379baf887221c0776b4152613c2a8a2d':
  DO NOT MERGE Hide banner manifest attribute.
 2014-05-06 21:24:02 +00:00
Tim Kilbourn
17c5e99037 Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev 2014-05-06 21:21:37 +00:00
Dan Stoza
045eef9714 am b2067fd4: Merge "Enable changing display configuration" 
* commit 'b2067fd4b6ca27b5597a457732c5adbae5081a43':
  Enable changing display configuration
 2014-05-06 21:11:38 +00:00
Dan Stoza
9bd01ef0c6 Merge "Enable changing display configuration" 2014-05-06 21:08:15 +00:00
Jeff Brown
1550f5235e am 04062754: am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev 
* commit '04062754924d7b72b57e33d01aade784701c604c':
  Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
 2014-05-06 20:38:42 +00:00
Jeff Brown
cedde01622 am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev 
* commit 'a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d':
  Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
 2014-05-06 20:34:12 +00:00
Jeff Brown
f2e1ac7d59 am 830d29b0: Merge "Plumb display state and interactive information to BatteryStats." 
* commit '830d29b0c248b62a590866573a7d17e880c3c608':
  Plumb display state and interactive information to BatteryStats.
 2014-05-06 20:31:18 +00:00
Jeff Brown
a93369a819 am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev 
* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
  Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
 2014-05-06 20:30:49 +00:00
Jeff Brown
996e269d93 Merge "Plumb display state and interactive information to BatteryStats." 2014-05-06 20:28:36 +00:00
Jeff Brown
84aaf124b7 Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev 2014-05-06 20:27:34 +00:00
Adam Powell
f14f0a6cf4 am 7f85f16c: am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit '7f85f16c7d131699bef67aff6a107ce622e65b8d':
  onWindowDismissed API cleanup
 2014-05-06 20:27:23 +00:00
Adam Powell
5f97930fc5 am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit 'c41fa708271e204a7983aba291389ea1554227b2':
  onWindowDismissed API cleanup
 2014-05-06 20:24:23 +00:00
Jeff Brown
e95c3cd895 Plumb display state and interactive information to BatteryStats. 
Fixes an issue where dozing was treated the same as the screen
being fully on.  Now dozing is treated the same as the screen
being fully off which is slightly better.  The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
 2014-05-06 13:23:53 -07:00
Chris Craik
928a0632e5 am 60fbef43: Merge "Fix pivot update rejection logic" 
* commit '60fbef4368a706954eed64f9acada3f26072a429':
  Fix pivot update rejection logic
 2014-05-06 20:23:26 +00:00
Adam Powell
c41fa70827 am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
  onWindowDismissed API cleanup
 2014-05-06 20:20:40 +00:00
Jeff Brown
01ee6f6cf7 Plumb display state and interactive information to BatteryStats. (DO NOT MERGE) 
Fixes an issue where dozing was treated the same as the screen
being fully on.  Now dozing is treated the same as the screen
being fully off which is slightly better.  The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
 2014-05-06 13:18:19 -07:00
Adam Powell
a0516e7ad1 Merge "onWindowDismissed API cleanup" into klp-modular-dev 2014-05-06 20:17:31 +00:00
Chris Craik
55d47f6be8 Merge "Fix pivot update rejection logic" 2014-05-06 20:17:29 +00:00
Jorim Jaggi
dc4d3c37fd am a2e10038: Merge "Never close Keyguard automatically." 
* commit 'a2e10038fce80323c86ac90dff8d5d7216cde00f':
  Never close Keyguard automatically.
 2014-05-06 20:06:21 +00:00
Jorim Jaggi
ef3b18b101 Merge "Never close Keyguard automatically." 2014-05-06 20:01:43 +00:00
Tim Kilbourn
d689db4f0c DO NOT MERGE Hide banner manifest attribute. 
Bug: 14116162
Change-Id: I42a73183bee52286ff315fa5b0f58bfdfc020485
 2014-05-06 12:02:42 -07:00
Dan Stoza
00101052b5 Enable changing display configuration 
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
 2014-05-06 11:34:06 -07:00
Chris Craik
6c1787cfea Fix pivot update rejection logic 
bug:14228573
Change-Id: Ia4c88f878ce325ee961117cf255c971d9947d5c6
 2014-05-06 11:02:39 -07:00
Tim Kilbourn
a4853f6d73 am 3439728c: Fix bad merge. 
* commit '3439728cebd6fad754ffcf33ea6d640e6ddc6f87':
  Fix bad merge.
 2014-05-06 18:00:35 +00:00
Tim Kilbourn
a2d106d470 Fix bad merge. 
Change-Id: I4d3aa71f5a4ae13c01e57df25ae7f76d25384f5d
 2014-05-06 10:54:00 -07:00
Tim Kilbourn
d5090dacfc am 6824d13d: am f7330ac7: am 989dab11: Update current.txt after hiding isGame. 
* commit '6824d13da8ce6c128427f77b4776c991ae51d702':
  Update current.txt after hiding isGame.
 2014-05-06 17:49:43 +00:00
Tim Kilbourn
e650e050e1 am 47d13bab: am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute. 
* commit '47d13bab53c4a35dc8bb51edbdb06c0c12d4f77a':
  DO NOT MERGE Hide isGame manifest attribute.
 2014-05-06 17:49:38 +00:00
Tim Kilbourn
d06b29d0f7 am f7330ac7: am 989dab11: Update current.txt after hiding isGame. 
* commit 'f7330ac754d02089dedef5d7191bde9a75b91c2c':
  Update current.txt after hiding isGame.
 2014-05-06 17:46:02 +00:00
Tim Kilbourn
23b0d53541 am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute. 
* commit 'a7b267b81b611058ddf7c268f5d21705f5306047':
  DO NOT MERGE Hide isGame manifest attribute.
 2014-05-06 17:45:58 +00:00
Tim Kilbourn
f7330ac754 am 989dab11: Update current.txt after hiding isGame. 
* commit '989dab11d1e34d5f49ac19345a3ce440d32d6f64':
  Update current.txt after hiding isGame.
 2014-05-06 17:42:36 +00:00