OSDN Git Service
Ronghua Wu [Wed, 29 Jul 2015 02:12:38 +0000 (02:12 +0000)]
am
cdd81636: am
29bac774: am
9090d3c3: am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
cdd81636e1938e7c9053648a13e6ccebd2ba9d2f':
media: fix estimateFrameRatesFor to use correct ratio
Dianne Hackborn [Wed, 29 Jul 2015 02:12:31 +0000 (02:12 +0000)]
am
a720d91e: am
077ec5c2: am
b7eb3901: am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
a720d91e5a9241510cfeaa5de0c894ddfb154a65':
Fix issue #
22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 02:12:24 +0000 (02:12 +0000)]
am
5d4a5ccb: am
94d5e6b0: am
779ccbe3: am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
5d4a5ccbadb8d17a900297aa9e766824a0a0397c':
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 02:12:17 +0000 (02:12 +0000)]
am
e319841d: am
05e4e78d: am
1b391d64: am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
e319841da95a22152bfc4c519a2ab99478b7f68c':
Fix issue #
22802782: APR: NPE in package manager with bad intent data
Ronghua Wu [Wed, 29 Jul 2015 01:47:43 +0000 (01:47 +0000)]
am
29bac774: am
9090d3c3: am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
29bac774ccba0d696857a058f5a1fae7d5c99ba5':
media: fix estimateFrameRatesFor to use correct ratio
Dianne Hackborn [Wed, 29 Jul 2015 01:47:35 +0000 (01:47 +0000)]
am
077ec5c2: am
b7eb3901: am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
077ec5c2ab5e0865c011c4f8fd86c557d31acefd':
Fix issue #
22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 01:47:29 +0000 (01:47 +0000)]
am
94d5e6b0: am
779ccbe3: am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
94d5e6b047ecef8e06b45c61ce850e4f1619fe0e':
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 01:47:23 +0000 (01:47 +0000)]
am
05e4e78d: am
1b391d64: am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
05e4e78d24c5583a44d3f7e52985d028de420723':
Fix issue #
22802782: APR: NPE in package manager with bad intent data
Adam Lesinski [Wed, 29 Jul 2015 01:47:06 +0000 (01:47 +0000)]
am
2529d39d: am
858e4a6f: am
9aae8d9c: am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
2529d39d3184ab66207f3fde9f2106276a2c1c16':
BatteryStats: Use proper power calculator when energy data is received
Jason Monk [Wed, 29 Jul 2015 01:47:00 +0000 (01:47 +0000)]
am
da808d29: am
3623f314: am
ea0ad979: am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
da808d298e84288b63413d05c755c81f3c4826e1':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 01:46:55 +0000 (01:46 +0000)]
am
25931a50: am
33aeb1fe: am
822456eb: am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
25931a507722a15383f5a554eee37eebe61488a7':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Adam Lesinski [Wed, 29 Jul 2015 01:28:36 +0000 (01:28 +0000)]
am
858e4a6f: am
9aae8d9c: am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
858e4a6f89c6d2b09d65ccc6907aa357f7e3f125':
BatteryStats: Use proper power calculator when energy data is received
Jason Monk [Wed, 29 Jul 2015 01:28:30 +0000 (01:28 +0000)]
am
3623f314: am
ea0ad979: am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
3623f314af10b75da34131cd5fc3ddffc481d926':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 01:28:23 +0000 (01:28 +0000)]
am
33aeb1fe: am
822456eb: am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
33aeb1fead92d19d9e9f01fd880df552a0c12fcf':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Ronghua Wu [Wed, 29 Jul 2015 01:27:09 +0000 (01:27 +0000)]
am
9090d3c3: am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
9090d3c3d46f7c52fe744ddcd104578b6a5cc742':
media: fix estimateFrameRatesFor to use correct ratio
Dianne Hackborn [Wed, 29 Jul 2015 01:27:05 +0000 (01:27 +0000)]
am
b7eb3901: am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
b7eb3901563f44b0a5997a6586a222c662e22220':
Fix issue #
22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 01:27:00 +0000 (01:27 +0000)]
am
779ccbe3: am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
779ccbe3cb556ab00ad04f2f2317e8ad4bfc8f2c':
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 01:26:55 +0000 (01:26 +0000)]
am
1b391d64: am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
1b391d6499c161ded570ef45ad3083458529723d':
Fix issue #
22802782: APR: NPE in package manager with bad intent data
Adam Lesinski [Wed, 29 Jul 2015 01:02:09 +0000 (01:02 +0000)]
am
9aae8d9c: am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
9aae8d9c1b2219f9d98ac07b1fe04ef62c4cacb9':
BatteryStats: Use proper power calculator when energy data is received
Jason Monk [Wed, 29 Jul 2015 01:02:04 +0000 (01:02 +0000)]
am
ea0ad979: am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
ea0ad97949706d63e9fc0088e1e851d2dc91a2c1':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 01:01:59 +0000 (01:01 +0000)]
am
822456eb: am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
822456ebe33ae366f5488794bdef68337d22974d':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Ronghua Wu [Wed, 29 Jul 2015 01:00:50 +0000 (01:00 +0000)]
am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
02022b70bef7d6964bc8043385531d1aa97fb15b':
media: fix estimateFrameRatesFor to use correct ratio
Dianne Hackborn [Wed, 29 Jul 2015 01:00:45 +0000 (01:00 +0000)]
am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
b310c8945330a0a94abae34451e0bdc227f52035':
Fix issue #
22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 01:00:41 +0000 (01:00 +0000)]
am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
5b009d523c6ad89f946e4a19f3fdba3c63bcf1f5':
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 01:00:37 +0000 (01:00 +0000)]
am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
b492ced89eaf38b2b9962dbfae2435dd242abf19':
Fix issue #
22802782: APR: NPE in package manager with bad intent data
Ronghua Wu [Wed, 29 Jul 2015 00:53:12 +0000 (00:53 +0000)]
Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:47:33 +0000 (00:47 +0000)]
Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:46:20 +0000 (00:46 +0000)]
Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:45:18 +0000 (00:45 +0000)]
Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 00:41:03 +0000 (00:41 +0000)]
am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
c96e6f19937ac36c8147a52863a43b35895aeb0b':
BatteryStats: Use proper power calculator when energy data is received
Jason Monk [Wed, 29 Jul 2015 00:40:58 +0000 (00:40 +0000)]
am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
fbcbad138d1b4c55e86ff671821b4feb7fc48f50':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 00:40:53 +0000 (00:40 +0000)]
am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
15938235d25a879ebb000cb3671fd75cb092e981':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Dianne Hackborn [Wed, 29 Jul 2015 00:40:06 +0000 (17:40 -0700)]
Fix issue #
22802691: APR: NPE in ActivityRecord
Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
Adam Lesinski [Wed, 29 Jul 2015 00:34:38 +0000 (00:34 +0000)]
Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
Jason Monk [Wed, 29 Jul 2015 00:31:16 +0000 (00:31 +0000)]
Merge "Add sizes to SysUI tests" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:30:59 +0000 (17:30 -0700)]
Fix issue #
22802782: APR: NPE in package manager with bad intent data
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.
Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
Jorim Jaggi [Wed, 29 Jul 2015 00:28:13 +0000 (00:28 +0000)]
am
ce58fa95: am
fed9b281: am
353fe1c6: am
0d210f63: Animation for touch, wake and unlock
* commit '
ce58fa9593ae9b0d5e29485019876bde5c54848b':
Animation for touch, wake and unlock
Chris Tate [Wed, 29 Jul 2015 00:28:07 +0000 (00:28 +0000)]
am
f9f837fa: am
6613ec44: am
403e22b9: am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
f9f837faa6a9fa242610a620caee185a8d1826cf':
Don't redundantly call transport.finishRestore()
Dianne Hackborn [Wed, 29 Jul 2015 00:22:46 +0000 (17:22 -0700)]
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Just don't do a wtf here, it isn't really wrong (though it isn't really
right, but at this point in a release it is right enough!).
Change-Id: Ic38a2e27556224cf8868f1fa18b4810929d67fcc
Aravind Akella [Wed, 29 Jul 2015 00:21:18 +0000 (00:21 +0000)]
Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 00:11:29 +0000 (17:11 -0700)]
BatteryStats: Use proper power calculator when energy data is received
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.
We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.
Bug:
22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
Jorim Jaggi [Wed, 29 Jul 2015 00:07:24 +0000 (00:07 +0000)]
am
fed9b281: am
353fe1c6: am
0d210f63: Animation for touch, wake and unlock
* commit '
fed9b2817ffec229baed7c7ea378fae98254b4dd':
Animation for touch, wake and unlock
Chris Tate [Wed, 29 Jul 2015 00:07:19 +0000 (00:07 +0000)]
am
6613ec44: am
403e22b9: am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
6613ec44a5ffec6636f0ccc0362869ee947e604a':
Don't redundantly call transport.finishRestore()
Zach Johnson [Wed, 29 Jul 2015 00:06:47 +0000 (00:06 +0000)]
am
0117bc33: am
f8c99378: am
bd388372: am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
0117bc33e2af4045519c4155e4f8c2446db5ec17':
Add filter for personal apps that are not disabled until first use
Todd Kennedy [Tue, 28 Jul 2015 23:45:08 +0000 (23:45 +0000)]
am
4c423351: am
b91bf1f3: am
673fed99: am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
4c423351c0713e8255e32fa0feb7b606fe0c8278':
Partially revert package freezing
Zach Johnson [Tue, 28 Jul 2015 23:43:50 +0000 (23:43 +0000)]
am
f8c99378: am
bd388372: am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
f8c99378367ef025b9da981d62806d1d06ef299e':
Add filter for personal apps that are not disabled until first use
Jorim Jaggi [Tue, 28 Jul 2015 23:43:46 +0000 (23:43 +0000)]
am
353fe1c6: am
0d210f63: Animation for touch, wake and unlock
* commit '
353fe1c665e0065d4c8eecdf41c22f1a1a607f2c':
Animation for touch, wake and unlock
Chris Tate [Tue, 28 Jul 2015 23:43:42 +0000 (23:43 +0000)]
am
403e22b9: am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
403e22b97dc3763e55bf2fb9ab0d681e7ee6c828':
Don't redundantly call transport.finishRestore()
Zach Johnson [Tue, 28 Jul 2015 23:23:38 +0000 (23:23 +0000)]
am
bd388372: am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
bd388372a81472aa3a5f40e57f9f541f85931495':
Add filter for personal apps that are not disabled until first use
Todd Kennedy [Tue, 28 Jul 2015 23:20:15 +0000 (23:20 +0000)]
am
b91bf1f3: am
673fed99: am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
b91bf1f3ced1692b30bd731e6f5555a69ad63d72':
Partially revert package freezing
Jorim Jaggi [Tue, 28 Jul 2015 23:19:39 +0000 (23:19 +0000)]
am
0d210f63: Animation for touch, wake and unlock
* commit '
0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
Animation for touch, wake and unlock
Chris Tate [Tue, 28 Jul 2015 23:19:34 +0000 (23:19 +0000)]
am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
751a96a040ada09199ca3356d9a515ec090d1237':
Don't redundantly call transport.finishRestore()
Jorim Jaggi [Fri, 10 Jul 2015 21:24:44 +0000 (14:24 -0700)]
Animation for touch, wake and unlock
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
First, start with a black scrim on top of everything, and then fade
it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
in the same manner as the scrim.
Bug:
22571198
Bug:
21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
Zach Johnson [Tue, 28 Jul 2015 22:58:11 +0000 (22:58 +0000)]
am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
5faa033615dcb4297fcb6a81828099285364942d':
Add filter for personal apps that are not disabled until first use
Todd Kennedy [Tue, 28 Jul 2015 22:58:03 +0000 (22:58 +0000)]
am
673fed99: am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
673fed99b931ce0efc17b0e549e7842e4775154c':
Partially revert package freezing
Chris Tate [Tue, 28 Jul 2015 22:56:41 +0000 (22:56 +0000)]
Merge "Don't redundantly call transport.finishRestore()" into mnc-dev
Todd Kennedy [Tue, 28 Jul 2015 22:37:28 +0000 (22:37 +0000)]
am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
f2c616ed02aee3b9a9025caf288aadbf22cfd046':
Partially revert package freezing
Zach Johnson [Tue, 28 Jul 2015 22:36:30 +0000 (22:36 +0000)]
Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
Todd Kennedy [Tue, 28 Jul 2015 22:15:43 +0000 (22:15 +0000)]
Merge "Partially revert package freezing" into mnc-dev
Ronghua Wu [Tue, 28 Jul 2015 22:05:51 +0000 (15:05 -0700)]
media: fix estimateFrameRatesFor to use correct ratio
Bug:
22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
Tyler Gunn [Tue, 28 Jul 2015 21:36:58 +0000 (21:36 +0000)]
am
8d74abb5: am
444185e8: am
3d83e744: am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
8d74abb5bb5cf479f97b26ca8328766dbd6a4257':
Add "Call subject" capability to phone accounts.
Tyler Gunn [Tue, 28 Jul 2015 21:15:53 +0000 (21:15 +0000)]
am
444185e8: am
3d83e744: am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
444185e881a3c7d449478e20199b76f5d2bd452d':
Add "Call subject" capability to phone accounts.
Christopher Tate [Tue, 28 Jul 2015 20:59:35 +0000 (13:59 -0700)]
Don't redundantly call transport.finishRestore()
The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.
Bug
22640096
Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
Dianne Hackborn [Tue, 28 Jul 2015 21:03:15 +0000 (21:03 +0000)]
am
639fd0e9: am
025a5dc6: am
108f5493: am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
639fd0e9d8ecb59f8d15b3f1e5ec7a6ae6cc3161':
Work on issue #
21516866: Implement voice interaction in ResolverActivity
Jorim Jaggi [Tue, 28 Jul 2015 21:03:10 +0000 (21:03 +0000)]
am
048995f4: am
eb80a86d: am
359f1e91: am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
048995f403589ac71b440c18a81082ff26b2287d':
Don't use screenshot if structure is disabled (1/2)
Robert Greenwalt [Tue, 28 Jul 2015 21:03:04 +0000 (21:03 +0000)]
am
f99b6f28: am
872d264c: am
d6162cf2: am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
f99b6f2886cde0406798f0b8b4b1666c29b387bf':
Un-remove legacy ConnectivityManager API.
Tyler Gunn [Tue, 28 Jul 2015 20:53:16 +0000 (20:53 +0000)]
am
3d83e744: am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
3d83e74449acdf8195e0a4f7f82ad79fb3f891dd':
Add "Call subject" capability to phone accounts.
Todd Kennedy [Tue, 28 Jul 2015 20:52:49 +0000 (13:52 -0700)]
Partially revert package freezing
On the Nexus Player, upgrading the launcher would cause multiple, simultaneous
processes to be running. In order to prevent this regression, revert the portion
of ag/682591 dealing with package upgrades.
Bug:
21123444
Change-Id: I7a4cf98c7e28fc9893b1c0358d3a98702d94c039
Dianne Hackborn [Tue, 28 Jul 2015 20:43:57 +0000 (20:43 +0000)]
am
025a5dc6: am
108f5493: am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
025a5dc6decf2bd93e21640651b485f6420dbbfe':
Work on issue #
21516866: Implement voice interaction in ResolverActivity
Jorim Jaggi [Tue, 28 Jul 2015 20:43:50 +0000 (20:43 +0000)]
am
eb80a86d: am
359f1e91: am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
eb80a86df01629296bab48609493882a31b091f9':
Don't use screenshot if structure is disabled (1/2)
Robert Greenwalt [Tue, 28 Jul 2015 20:43:41 +0000 (20:43 +0000)]
am
872d264c: am
d6162cf2: am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
872d264c0a19ea0db078509edb17bd125ff5449d':
Un-remove legacy ConnectivityManager API.
Tyler Gunn [Tue, 28 Jul 2015 20:31:05 +0000 (20:31 +0000)]
am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
bdbec480e8598bd959a2fc047cfad8b72c8a645b':
Add "Call subject" capability to phone accounts.
Dianne Hackborn [Tue, 28 Jul 2015 20:22:50 +0000 (20:22 +0000)]
am
108f5493: am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
108f5493edb50201d3dd2ba32a19db93edad8800':
Work on issue #
21516866: Implement voice interaction in ResolverActivity
Jorim Jaggi [Tue, 28 Jul 2015 20:22:46 +0000 (20:22 +0000)]
am
359f1e91: am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
359f1e91e5715644b0da4f01e58c994a9e4598aa':
Don't use screenshot if structure is disabled (1/2)
Robert Greenwalt [Tue, 28 Jul 2015 20:22:41 +0000 (20:22 +0000)]
am
d6162cf2: am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
d6162cf244eab3a3c77a011ffe75dd04a787b951':
Un-remove legacy ConnectivityManager API.
Tyler Gunn [Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Add "Call subject" capability to phone accounts." into mnc-dev
Dianne Hackborn [Tue, 28 Jul 2015 19:57:40 +0000 (19:57 +0000)]
am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
3551a59b277fd4dc924f48116c153a50fb0913eb':
Work on issue #
21516866: Implement voice interaction in ResolverActivity
Jorim Jaggi [Tue, 28 Jul 2015 19:57:35 +0000 (19:57 +0000)]
am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
850dd6907f87782474d4bc128c8c0137a9cc85fc':
Don't use screenshot if structure is disabled (1/2)
Robert Greenwalt [Tue, 28 Jul 2015 19:57:31 +0000 (19:57 +0000)]
am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
b3c93c5f4256a1da1a8020abe5812a841b67667a':
Un-remove legacy ConnectivityManager API.
Dianne Hackborn [Tue, 28 Jul 2015 19:52:53 +0000 (19:52 +0000)]
Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
Dianne Hackborn [Tue, 28 Jul 2015 01:11:14 +0000 (18:11 -0700)]
Work on issue #
21516866: Implement voice interaction in ResolverActivity
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.
This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.
Also added some debug help, having activity print the state of the
voice interactor.
Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
Jorim Jaggi [Tue, 28 Jul 2015 19:49:44 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev
Robert Greenwalt [Tue, 28 Jul 2015 19:39:48 +0000 (19:39 +0000)]
Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
Jason Monk [Tue, 28 Jul 2015 19:27:12 +0000 (19:27 +0000)]
am
396da07e: am
6c9001fc: am
52fbf583: am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
396da07e7992f8a5877162d40ba02dd0e0987fc4':
Fix network name not showing in QS sometimes
Jason Monk [Tue, 28 Jul 2015 19:06:23 +0000 (19:06 +0000)]
am
6c9001fc: am
52fbf583: am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
6c9001fc28ea0abbfe95ef7aec1cdcd7192cd963':
Fix network name not showing in QS sometimes
Jason Monk [Tue, 28 Jul 2015 18:41:51 +0000 (18:41 +0000)]
am
52fbf583: am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
52fbf5833992195c790114ad1ef9ab5883d1b2b2':
Fix network name not showing in QS sometimes
Robert Greenwalt [Tue, 28 Jul 2015 18:41:31 +0000 (11:41 -0700)]
Un-remove legacy ConnectivityManager API.
These were @removed too soon. We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.
bug:
22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
Jason Monk [Tue, 28 Jul 2015 18:22:30 +0000 (18:22 +0000)]
am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
350662197542d406df58aa65afddc9e23f9309d3':
Fix network name not showing in QS sometimes
Jason Monk [Tue, 28 Jul 2015 18:05:49 +0000 (18:05 +0000)]
Merge "Fix network name not showing in QS sometimes" into mnc-dev
Tyler Gunn [Tue, 28 Jul 2015 15:50:49 +0000 (15:50 +0000)]
am
baca9e1e: am
0be28a7f: am
c5c7987f: Merge "Add child_address call extra." into mnc-dr-dev
* commit '
baca9e1eb60d69ef014635625f18e4bbf46daf33':
Add child_address call extra.
Tyler Gunn [Tue, 28 Jul 2015 15:34:46 +0000 (15:34 +0000)]
am
0be28a7f: am
c5c7987f: Merge "Add child_address call extra." into mnc-dr-dev
* commit '
0be28a7f5351af556f2fd29dbc68cb97b57b2eac':
Add child_address call extra.
Tyler Gunn [Tue, 28 Jul 2015 15:24:05 +0000 (15:24 +0000)]
am
c5c7987f: Merge "Add child_address call extra." into mnc-dr-dev
* commit '
c5c7987feaec7cf85b62e0c6f4048396482a729e':
Add child_address call extra.
Tyler Gunn [Tue, 28 Jul 2015 15:07:03 +0000 (15:07 +0000)]
Merge "Add child_address call extra." into mnc-dr-dev
Jason Monk [Tue, 28 Jul 2015 13:18:08 +0000 (09:18 -0400)]
Add sizes to SysUI tests
Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86
Adam Lesinski [Tue, 28 Jul 2015 02:03:05 +0000 (02:03 +0000)]
am
29f8e978: am
6548f9b8: am
3209e18c: am
60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
* commit '
29f8e978d263131eea5aaa7a159f2396863800b6':
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
Lorenzo Colitti [Tue, 28 Jul 2015 02:02:59 +0000 (02:02 +0000)]
am
b0014e9f: am
08ef66bb: am
62ca62b3: am
e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '
b0014e9f38bb7e01ba488e50c61f3fc9a7aaf9fc':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Adam Lesinski [Tue, 28 Jul 2015 01:50:55 +0000 (01:50 +0000)]
am
6548f9b8: am
3209e18c: am
60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
* commit '
6548f9b87652870de229eadfd1780bf7a406cb82':
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
Lorenzo Colitti [Tue, 28 Jul 2015 01:50:43 +0000 (01:50 +0000)]
am
08ef66bb: am
62ca62b3: am
e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '
08ef66bbbc0e760a9d71f6a2c36014904fa0bae2':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Filip Gruszczynski [Tue, 28 Jul 2015 01:48:14 +0000 (01:48 +0000)]
am
764707f0: am
1bf3d222: Merge "Don\'t animate burn-in return when it wasn\'t applied." into cw-e-dev
* commit '
764707f03daaa781199b0bebacf159167d63c603':
Don't animate burn-in return when it wasn't applied.
Filip Gruszczynski [Tue, 28 Jul 2015 01:34:10 +0000 (01:34 +0000)]
am
1bf3d222: Merge "Don\'t animate burn-in return when it wasn\'t applied." into cw-e-dev
* commit '
1bf3d222374063a3dd5a2ad2df2fdf8ca4d49786':
Don't animate burn-in return when it wasn't applied.
OSDN Git Service
