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

172115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
4901badeca am 7847a7f8: am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '7847a7f8f4b682e6776439058216796d351cb693':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:52:59 +00:00
John Spurlock
7847a7f8f4 am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '6ccb72e9940df9b50a213fa84483ed5da9780cd0':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:43:18 +00:00
Adam Lesinski
1adf320606 am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-dev-plus-aosp 
* commit '8491c4ead7dba5cfd406cf99a511fc1dce07cc4d':
  Add error checking to aapt for split generation
 2014-11-05 20:35:27 +00:00
Adam Lesinski
8491c4ead7 Merge "Merge commit 'fb96e54' into manualmerge" into lmp-mr1-dev-plus-aosp 2014-11-05 20:31:20 +00:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00
Dan Albert
a2e5edd08f am be3ac2a8: am 59701b9b: resolved conflicts for merge of 97014933 to stage-aosp-master 
* commit 'be3ac2a80b3607220a118abeb2dd0678f722af2c':
  Fix a wonderful copy/paste time bomb.
 2014-11-05 20:21:44 +00:00
Craig Mautner
80fd257094 am b3d26022: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge: 3f36ba6 automerge: a72b222 
* commit 'b3d260222fd003c8b537bb9f86625a200bd0f999':
  When keyguard exits use same anim for all windows
 2014-11-05 20:15:51 +00:00
Paul Jensen
66d03ca8c6 am a21622df: am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev automerge: 6ad91cb 
* commit 'a21622df7e1368e7321059a5f5047d2011fd71e5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:15:46 +00:00
Dan Sandler
a026f47494 am c45d74f8: am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev automerge: 125fb86 
* commit 'c45d74f81283af6ffaa7e6fde1194e733f00b0f2':
  Materialize default app icon.
 2014-11-05 20:15:41 +00:00
Ricardo Cervera
4739e17052 am 85ba0d92: am 0f288c6a: am caecc4ae: am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 
* commit '85ba0d929f4cd6651e5a288d5840b4ee5854e147':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:15:37 +00:00
Bryce Lee
35896c530d am 4947ff46: am 1ae5dc12: am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '4947ff462795ae9927b98fa2346634af5bbbf7c4':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 20:15:32 +00:00
Daniel Sandler
c053e41d02 am 8d37f7c1: am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev 
* commit '8d37f7c1b28c4e82b3bc961d183c313db16d8333':
  More flexible intent extra parsing.
 2014-11-05 20:15:27 +00:00
Dan Albert
be3ac2a80b am 59701b9b: resolved conflicts for merge of 97014933 to stage-aosp-master 
* commit '59701b9ba5c453e327bc0e6873a9f6ff87a10391':
  Fix a wonderful copy/paste time bomb.
 2014-11-05 20:11:53 +00:00
Craig Mautner
b3d260222f Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge: 3f36ba6 
automerge: a72b222

* commit 'a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c':
  When keyguard exits use same anim for all windows
 2014-11-05 20:01:56 +00:00
Paul Jensen
a21622df7e am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 
automerge: 6ad91cb

* commit '6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:00:46 +00:00
Dan Sandler
c45d74f812 am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev 
automerge: 125fb86

* commit '125fb86ee0cc0e49d6847bed7a76829ad87c1312':
  Materialize default app icon.
 2014-11-05 19:59:19 +00:00
John Spurlock
6ccb72e994 Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 
automerge: 2f9e7f6

* commit '2f9e7f6d8b6716f0fcc7db9ef797667ebda8a813':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 19:32:54 +00:00
Adam Lesinski
fb96e54ba8 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 
automerge: 69ecfa9

* commit '69ecfa903492b502b7b1636345e050b57313c251':
  Add error checking to aapt for split generation
 2014-11-05 19:31:22 +00:00
Craig Mautner
a72b2228c2 Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 
automerge: 3f36ba6

* commit '3f36ba647d6bd49363ea9f025a8b1aeac0abeddd':
  When keyguard exits use same anim for all windows
 2014-11-05 19:30:19 +00:00
Dan Albert
59701b9ba5 resolved conflicts for merge of 97014933 to stage-aosp-master 
Change-Id: I078368a7452b8cdc67f299985c60eef90f144367
 2014-11-05 11:29:34 -08:00
John Spurlock
2f9e7f6d8b Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 2014-11-05 19:17:39 +00:00
Adam Lesinski
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +00:00
John Spurlock
cc30c8d729 Zen: Add the ability to enter "None" mode during downtime. 
Updates to the shared config structure and the service backend.

Bug: 16373455
Change-Id: I45761690ba6b32eb81c9e2a5c1f2d4adad93e58d
 2014-11-05 14:12:30 -05:00
Paul Jensen
6ad91cbce2 am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 
* commit '021a95f761e1bc26cc215a9daedb04af818002f5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 19:11:32 +00:00
Craig Mautner
3f36ba647d Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 2014-11-05 19:07:59 +00:00
Ricardo Cervera
85ba0d929f am 0f288c6a: am caecc4ae: am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 
* commit '0f288c6a246e4d6841b13ca13132910192cdd22b':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 19:06:36 +00:00
Bryce Lee
4947ff4627 am 1ae5dc12: am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '1ae5dc12d0013835ed5c567b6e8ca3343524f2e3':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 19:06:31 +00:00
Daniel Sandler
8d37f7c1b2 am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev 
* commit '9647bdd97ec7fda804244bde195ca10219726e89':
  More flexible intent extra parsing.
 2014-11-05 19:06:25 +00:00
Dan Sandler
125fb86ee0 am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev 
* commit 'ac8dbdafeab9db9f44a40ea31d5cdbc1404acb68':
  Materialize default app icon.
 2014-11-05 19:06:25 +00:00
Paul Jensen
021a95f761 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 2014-11-05 19:05:09 +00:00
RoboErik
341dd2bda5 am 5468f292: am acbdb4fe: am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 
* commit '5468f292f31383ba1ea9b488e1d0dfc743764f47':
  Post volume requests to the handler thread in MediaSession
 2014-11-05 19:01:45 +00:00
RoboErik
305563bd63 am 6651cd38: am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit '6651cd38307d516f5c8e322828b7aaa076231071':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 19:01:40 +00:00
Jeff Davidson
b2e27cd6b8 am a820564d: am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'a820564d9c43f2a3241339aec9ba08803e37b3ed':
  Update network selections on capability change.
 2014-11-05 19:01:36 +00:00
Filip Gruszczynski
0f337b776b am cac8e4a5: am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit 'cac8e4a5aaf35e1dae23da3b4557d8f3d37c07b8':
  Automatic brightness using ALS while dozing.
 2014-11-05 19:01:26 +00:00
Ricardo Cervera
0f288c6a24 am caecc4ae: am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 
* commit 'caecc4ae3d11604fd20230dab79a9b79634d2c48':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 19:01:02 +00:00
Bryce Lee
1ae5dc12d0 am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit 'ca7f9a4d4eaa4a14c45199a586ec25efee7407fa':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 19:00:56 +00:00
Daniel Sandler
9647bdd97e am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev 
* commit '70bbbd32beefbb8e5c2e2dfa7a417274f80e2da2':
  More flexible intent extra parsing.
 2014-11-05 19:00:51 +00:00
Dan Sandler
ac8dbdafea Merge "Materialize default app icon." into lmp-mr1-dev 2014-11-05 18:58:14 +00:00
RoboErik
5468f292f3 am acbdb4fe: am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 
* commit 'acbdb4fe5d2e4bd7729f3685b2d78421d5d13cc8':
  Post volume requests to the handler thread in MediaSession
 2014-11-05 18:55:53 +00:00
RoboErik
6651cd3830 am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit 'e2b8dab0d0f541e4a014536f8088ac51afc06c49':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:55:46 +00:00
Jeff Davidson
a820564d9c am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'd9685fac35c1c3ba797eb9e534ec15888aaa3a8b':
  Update network selections on capability change.
 2014-11-05 18:55:40 +00:00
Filip Gruszczynski
cac8e4a5aa am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit '093e98908743eb37104a280541a060dcd46351d0':
  Automatic brightness using ALS while dozing.
 2014-11-05 18:55:34 +00:00
Ricardo Cervera
caecc4ae3d am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 
* commit 'df37d45f1311dcbfbcc58b3ff81f3df56c46fcdd':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 18:54:12 +00:00
Bryce Lee
ca7f9a4d4e am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '5a818e55a7faee421567eb037ac4e42f20bca0c4':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 18:54:06 +00:00
Daniel Sandler
70bbbd32be Merge "More flexible intent extra parsing." into lmp-mr1-dev 2014-11-05 18:53:44 +00:00
Dan Albert
97014933f0 Merge "Fix a wonderful copy/paste time bomb." 2014-11-05 18:50:10 +00:00
RoboErik
acbdb4fe5d am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 
* commit '9af44ddf0367c542d6c1db6060456bd72f3c83ca':
  Post volume requests to the handler thread in MediaSession
 2014-11-05 18:49:54 +00:00
RoboErik
e2b8dab0d0 am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit '5604a85ac61eb01794cf1dd9ea83321bcf93b57a':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:49:49 +00:00
Jeff Davidson
d9685fac35 am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'ea651a4fbf274d229ead0185286c94b6e823d605':
  Update network selections on capability change.
 2014-11-05 18:49:44 +00:00
Filip Gruszczynski
093e989087 am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit '34afdf0276044f7d40c58df65dd13b9cb774d7c6':
  Automatic brightness using ALS while dozing.
 2014-11-05 18:49:39 +00:00