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

124101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
3651cb7b4a am cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 
* commit 'cd9cd758d6dc884220f86ff10812c9e33a978de5':
  Start the dream manager even if dreams are not supported.
 2014-02-24 22:25:19 +00:00
John Spurlock
952862085a Merge "Remove tabs from NotificationData." 2014-02-24 22:24:15 +00:00
Jeff Brown
cd9cd758d6 am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 
* commit 'c213b3a34ccee7cfa72dab281cfa950e5f7df6fc':
  Start the dream manager even if dreams are not supported.
 2014-02-24 22:21:50 +00:00
Jeff Brown
c213b3a34c am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 
* commit 'f7f80d7b54b11d432bb6e72da526edf369128ea7':
  Start the dream manager even if dreams are not supported.
 2014-02-24 22:18:32 +00:00
Jeff Brown
f7f80d7b54 Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 2014-02-24 22:16:00 +00:00
Jeff Brown
e0dd3ca81d Start the dream manager even if dreams are not supported. 
The dreams manager also manages dozing.  It has a minimal footprint
so there is no real reason to disable the component (it just makes
debugging more difficult).

Improved the documentation of the config_dreamsSupported resource
to clarify exactly what it controls.

Bug: 12494706
Change-Id: I78244846f7c1ddfd11bc1605af59b0db91337971
 2014-02-24 14:07:27 -08:00
John Spurlock
362fafe68f Remove tabs from NotificationData. 
Change-Id: I1993c48816ffc953045e3ef29a1063b89af4a546
 2014-02-24 16:56:42 -05:00
Chris Craik
be85725e1e Merge "Damage IsolatedZVolume when shadows change" 2014-02-24 21:22:24 +00:00
Chris Craik
0b1591c1e3 Merge "Modulate shadow alpha by caster alpha" 2014-02-24 20:54:35 +00:00
John Reck
ee64201004 Merge "Add back resize buffer" 2014-02-24 20:41:16 +00:00
Dianne Hackborn
aec25d9224 Merge "Improve how battery stats collects network stats." 2014-02-24 20:33:42 +00:00
Alan Viverette
462c2177f7 Check for ongoing detachment in AbsListView 
BUG: 13167767
Change-Id: Ie1a828eadbb99daef46af77544f233fee09fd1bc
 2014-02-24 12:24:47 -08:00
Jake Hamby
786e71ab11 Remove unneeded new RIL command. 
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.

Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
 2014-02-24 11:42:51 -08:00
Dianne Hackborn
d0c5b9abed Improve how battery stats collects network stats. 
This optimizes the path for battery stats to collect
per-uid network usage.  It now collects wifi and mobile
usage separately, with a path that allows it to recycle
all data structures and filter out stats it isn't
interested in before they come back to java.

This is setting us up for the actual goal, to collect
mobile stats independently each time the mobile radio
goes down, allowing us to distribute mobile radio usage
across uids based on the number of packets they transferred
during a session.

Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
 2014-02-24 11:35:20 -08:00
Alan Viverette
35e2721399 Merge "Check for null view root before checking for accessibility focus" 2014-02-24 19:09:59 +00:00
Alan Viverette
2e6fc8ca56 Check for null view root before checking for accessibility focus 
BUG: 13168971
Change-Id: Ia75d77b18112371f56a624e11f9509f14ec98093
 2014-02-24 11:09:18 -08:00
Zhijun He
688084914d Merge "Camera2: update 3A state related metadata key docs" 2014-02-24 18:40:03 +00:00
Zhijun He
60b19dc2df Camera2: update 3A state related metadata key docs 
Bug: 12840262
Change-Id: I2092e1d24b262a0568b880094b8ad6a87510b346
 2014-02-24 10:19:20 -08:00
Chad Brubaker
9862a48574 Merge "Only allow System apps to make VPN exempt routes" 2014-02-24 18:09:56 +00:00
Chad Brubaker
4845037a48 Merge "Add the calling package name to requestRouteToHost" 2014-02-24 18:09:36 +00:00
Chong Zhang
8440a33b25 Merge "support time lapse/slow motion on SURFACE source" 2014-02-24 17:52:01 +00:00
Marco Nelissen
4531e9c45c Merge "Add method to get redirected Uri" 2014-02-24 17:14:28 +00:00
Torne (Richard Coles)
875e2101d7 Fix missing # in method name in javadoc. 
Fix doc generation.

Change-Id: I2e333a7224eeaff7a870fedc7f7a4eb113d1fe2f
 2014-02-24 14:11:56 +00:00
Yohei Yukawa
e0ebe276e5 Merge "Remove trailing spaces and tabs" 2014-02-24 11:20:49 +00:00
Yohei Yukawa
66996dafa7 Remove trailing spaces and tabs 
Actual fix will be covered by subsequent patches.

BUG: 12954290
Change-Id: I55f2374fd447d5b3d5a696de6f9b493e32f4e17a
 2014-02-24 19:51:04 +09:00
Sander Alewijnse
627de95925 Merge "Enables a profile owner or device owner to set and clear default intent handler activities." 2014-02-24 10:16:28 +00:00
Alan Viverette
12b97f5d2b Change colorFilterColor to tint, allow use of ColorStateList 
BUG: 13149901
Change-Id: I6487bec372cb74db53d7bbdfa35de071764763b0
 2014-02-23 18:32:20 -08:00
Alan Viverette
cc3f33853b Allow alpha modulation in ColorStateList items 
This makes it much easier to define a disabled state color as an alpha
modulation of some base color.

Change-Id: Ie2ecf40b1f6560fcd8eda208d780616dddfc0d08
 2014-02-22 16:52:46 -08:00
Deepanshu Gupta
cba616d85f Merge "Update layoutlib tests to check methods return value." 2014-02-22 19:04:48 +00:00
Craig Mautner
92a507986a am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev 
* commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
  Fixes for ActivityView on home activity
 2014-02-22 07:51:02 +00:00
Craig Mautner
3dc57b39f2 am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev 
* commit 'c004c9a87f0d4afa3a01f39922ad934def93c776':
  Fixes for ActivityView on home activity
 2014-02-22 07:44:51 +00:00
Craig Mautner
c004c9a87f am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev 
* commit 'ffda464851008f750246f343c939d8003071cd23':
  Fixes for ActivityView on home activity
 2014-02-22 07:33:24 +00:00
Craig Mautner
ffda464851 Merge "Fixes for ActivityView on home activity" into klp-modular-dev 2014-02-22 05:11:22 +00:00
Craig Mautner
12ff7391a1 Fixes for ActivityView on home activity 
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
 2014-02-21 21:08:00 -08:00
Scott Main
3196d811d0 am a0e30c4b: am 5670ddea: am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit 'a0e30c4b9dc1b0acb019f07c0d124d97740c93a2':
  add android studio to launch procedures
 2014-02-22 04:10:11 +00:00
John Reck
e56e9df5f1 Add back resize buffer 
Bug: 12825810

Change-Id: Ic2329c30524010f54778101853b30f8f8d9eeb6c
 2014-02-21 18:12:04 -08:00
Craig Mautner
5eb4adcbda resolved conflicts for merge of d2794f5e to master 
Change-Id: I24339e45e5fc697abf294286e2d6b57620ed9d1a
 2014-02-21 17:52:15 -08:00
Chris Craik
919e95cc23 Modulate shadow alpha by caster alpha 
Change-Id: Ibc4b3958feb3b5dba91d30af470d76555a6209c8
 2014-02-21 17:15:12 -08:00
Scott Main
a0e30c4b9d am 5670ddea: am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit '5670ddea3bc16c43a2040a5a224ed5fda53d7072':
  add android studio to launch procedures
 2014-02-22 01:01:18 +00:00
Chris Craik
ff641477a7 Damage IsolatedZVolume when shadows change 
bug:12874322
Change-Id: I3dd92f551dfb00965ccd08647586f378f8949b1c
 2014-02-21 16:59:56 -08:00
Scott Main
5670ddea3b am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit 'f8a68404c767cf4e5f3e63ab53737472066a90c1':
  add android studio to launch procedures
 2014-02-22 00:57:36 +00:00
Craig Mautner
d2794f5eb3 am 21c09e8a: am f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev 
* commit '21c09e8a58982531f69dcbce760be42528bc9f9d':
  Reset deferred task removal when app token added.
 2014-02-22 00:57:31 +00:00
Craig Mautner
21c09e8a58 am f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev 
* commit 'f0f454522ae5024645a292596e644c6f7a06853c':
  Reset deferred task removal when app token added.
 2014-02-22 00:53:43 +00:00
Scott Main
f8a68404c7 am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit '271f85399bbbe0b6a6719286a4b0857ff845cfc2':
  add android studio to launch procedures
 2014-02-22 00:53:21 +00:00
Craig Mautner
f0f454522a Merge "Reset deferred task removal when app token added." into klp-modular-dev 2014-02-22 00:50:55 +00:00
Scott Main
271f85399b am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit 'b26117aca0daadeb51369c8da617d5b7ba9b05b6':
  add android studio to launch procedures
 2014-02-22 00:50:08 +00:00
Alan Viverette
550267f72b Fix refactoring of invalidate methods 
Was incorrectly clearing the DRAWN flag and updating mLastIsOpaque from
partial invalidations, though why this should be different is somewhat
of a mystery.

BUG: 13138721
Change-Id: Ic8d11a64406bc78e94adec7355c1f50d87567887
 2014-02-21 16:48:33 -08:00
Scott Main
b26117aca0 am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs 
* commit '25b44ae684295b53ac7ba15d827fc03c51aee37b':
  add android studio to launch procedures
 2014-02-22 00:47:08 +00:00
Greg Hackmann
4418372b21 am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp 
* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
 2014-02-22 00:46:52 +00:00
Craig Mautner
42bf39edbd Reset deferred task removal when app token added. 
A task is scheduled for deletion after the final activity has
been removed and has animated away. But if another activity is then
added to the task the deletion flag must be reset.

Also added improved debugging.

Fixes bug 12987986.

Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
 2014-02-21 16:46:22 -08:00