Jungshik Jang
74e403fd39
am 6cc6bd39: am 1bc420cd: am 70ac06d8: Merge "Implement clear timer." into lmp-dev
...
* commit '6cc6bd399f41c6450d78ec0d4f4158a93f29affb':
Implement clear timer.
2014-08-05 00:45:22 +00:00
Jungshik Jang
4bf30389bf
am 1bc420cd: am 70ac06d8: Merge "Implement clear timer." into lmp-dev
...
* commit '1bc420cd8fcf7940a3467db4fee330fbbab84c00':
Implement clear timer.
2014-08-05 00:41:15 +00:00
Jungshik Jang
0ff1639113
am 70ac06d8: Merge "Implement clear timer." into lmp-dev
...
* commit '70ac06d844c12df388af6de22dd25a71be28af7f':
Implement clear timer.
2014-08-05 00:37:09 +00:00
Jungshik Jang
e5a9337ebe
Implement clear timer.
...
This change implements clear timer, which sends
<Clear xxx Timer> to recorder, and reponse of it,
<Timer Cleared Status>.
Along with it, add result parser for [Timer Status Data].
Bug: 16160962
Change-Id: I1f48ec055aa93dc836156525de8b7ef921aad8b5
2014-08-05 09:32:34 +09:00
Jungshik Jang
dc452eb05c
am 260d5100: am 9c55d10f: am 98be7752: Merge "Fix several bugs on timer recoder code." into lmp-dev
...
* commit '260d5100f3b6057091fd25016e68197fe36b17ec':
Fix several bugs on timer recoder code.
2014-08-04 23:45:41 +00:00
Jungshik Jang
8f6bb4f4b6
am 9c55d10f: am 98be7752: Merge "Fix several bugs on timer recoder code." into lmp-dev
...
* commit '9c55d10f40a3a84135195762e7a5805c4180af6c':
Fix several bugs on timer recoder code.
2014-08-04 23:41:19 +00:00
Jungshik Jang
5776de9de3
am 98be7752: Merge "Fix several bugs on timer recoder code." into lmp-dev
...
* commit '98be7752b3d129ba6392a7e8f32d9eb5ac7d5766':
Fix several bugs on timer recoder code.
2014-08-04 23:36:25 +00:00
Chris Craik
169b2cedf5
am fd8e8aec: am edf92aec: am 7a250371: Set default outline alpha to 1.0f
...
* commit 'fd8e8aecccb20cf8a66a226d27e2100853e4b37c':
Set default outline alpha to 1.0f
2014-08-04 21:10:41 +00:00
Yorke Lee
c7c9ce2d4a
am 76c61762: am 27627ecd: am ddf3fd48: Merge "Update documentation for ContactCounts" into lmp-dev
...
* commit '76c61762fe53d67dfa39a652118cc2d11a22f3c4':
Update documentation for ContactCounts
2014-08-04 21:06:09 +00:00
Chris Craik
305acfa81d
am edf92aec: am 7a250371: Set default outline alpha to 1.0f
...
* commit 'edf92aec5ee6bfaf57e6654c673a6e27a21de09c':
Set default outline alpha to 1.0f
2014-08-04 21:06:01 +00:00
Jeff Tinker
6de847ad9c
am 8d5f9cb2: am 37956deb: am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev
...
* commit '8d5f9cb2b4169c3770b5c89361452d60da765940':
Allow device to be unprovisioned
2014-08-04 21:01:11 +00:00
Yorke Lee
8fa9673da3
am 27627ecd: am ddf3fd48: Merge "Update documentation for ContactCounts" into lmp-dev
...
* commit '27627ecdb934cc85cf16641690f2c3474e7e35fc':
Update documentation for ContactCounts
2014-08-04 21:01:02 +00:00
Chris Craik
b55fa8318a
am 7a250371: Set default outline alpha to 1.0f
...
* commit '7a250371c7ae7de36b09ede742d690b0c0f3268d':
Set default outline alpha to 1.0f
2014-08-04 21:00:57 +00:00
Jeff Tinker
2abc07428f
am 37956deb: am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev
...
* commit '37956deb2eeed6ca03fc5a2941145e213372384d':
Allow device to be unprovisioned
2014-08-04 20:56:31 +00:00
Yorke Lee
a17c04d7de
am ddf3fd48: Merge "Update documentation for ContactCounts" into lmp-dev
...
* commit 'ddf3fd48924e7a91453fc5b25b9f98c6f2865c6d':
Update documentation for ContactCounts
2014-08-04 20:56:18 +00:00
Chris Craik
6efd17588b
Set default outline alpha to 1.0f
...
bug:16795461
Change-Id: I7ccecee84b47a2bbf91fc11ad3005160f913ba77
2014-08-04 20:53:41 +00:00
Jeff Tinker
01acb4af01
am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev
...
* commit 'f225e464e01055a9b5fc8f6293abf841f340da57':
Allow device to be unprovisioned
2014-08-04 20:51:54 +00:00
Chet Haase
a3277c93f4
am ed819db0: am 04c5921c: am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev
...
* commit 'ed819db06149255d5cc84968028c2e2e8b8b7048':
Give disappearing children a chance to recreate DisplayLists
2014-08-04 19:20:36 +00:00
Chet Haase
b81305a55a
am 04c5921c: am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev
...
* commit '04c5921c3e256f149d69d321b8729b2cf07840af':
Give disappearing children a chance to recreate DisplayLists
2014-08-04 19:14:24 +00:00
John Spurlock
61c4ac187a
am 6d065669: am d8fc8726: am cdc993dd: Doze: Add a user opt-out setting.
...
* commit '6d06566917cf3a6ac67e0648fa6710c634f93cda':
Doze: Add a user opt-out setting.
2014-08-04 19:14:07 +00:00
Chet Haase
944ca2dfd3
am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev
...
* commit '7c98f92375c8037b513b58f84d627dc592c7005d':
Give disappearing children a chance to recreate DisplayLists
2014-08-04 19:10:30 +00:00
John Spurlock
191d09c467
am d8fc8726: am cdc993dd: Doze: Add a user opt-out setting.
...
* commit 'd8fc8726188adf26929b998f14515cdffc313964':
Doze: Add a user opt-out setting.
2014-08-04 19:10:07 +00:00
John Spurlock
21752f5b4e
am cdc993dd: Doze: Add a user opt-out setting.
...
* commit 'cdc993dd255f9667e9b14c39e78c38718811d4d7':
Doze: Add a user opt-out setting.
2014-08-04 19:06:15 +00:00
John Spurlock
a4215ceb86
Doze: Add a user opt-out setting.
...
When devices are configured with a doze component, the user
now has the option of disabling doze mode with a secure setting.
Bug:16703536
Change-Id: Ieab6ee8d2acf54580b86fb16e9d77b52080fb3b1
2014-08-04 14:57:06 -04:00
Brian Carlstrom
64fbaecb6b
am 4f1fb962: am 5a9b135f: am 20bac14e: Merge changes I69c064b0,I1972c5af
...
* commit '4f1fb962b12ea95d6319614aafa4c2f4097e1831':
Move image classes options from art to AndroidRuntime [frameworks/base]
Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-04 18:45:04 +00:00
Brian Carlstrom
f0bdeaf55b
am bb68919d: am bccea16e: am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]"
...
* commit 'bb68919da23caf0ffcc2c8d697050f10fe54a4cc':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
2014-08-04 18:45:00 +00:00
Brian Carlstrom
31797e5c7b
am 5a9b135f: am 20bac14e: Merge changes I69c064b0,I1972c5af
...
* commit '5a9b135f983aa080fccbff29a328d1fc231d7e4a':
Move image classes options from art to AndroidRuntime [frameworks/base]
Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-04 18:37:59 +00:00
Brian Carlstrom
3c4d9ac865
am bccea16e: am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]"
...
* commit 'bccea16ec1dc0d91750dc2b6932c4d370b365b2a':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
2014-08-04 18:37:35 +00:00
Brian Carlstrom
5a9b135f98
am 20bac14e: Merge changes I69c064b0,I1972c5af
...
* commit '20bac14e521dd551addd8541380f1d9b6c910bd2':
Move image classes options from art to AndroidRuntime [frameworks/base]
Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-04 18:32:59 +00:00
Brian Carlstrom
bccea16ec1
am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]"
...
* commit '1de3c633dc1c355ee2356249e6309c5adf83c9a6':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
2014-08-04 18:32:54 +00:00
Geoff Mendal
400ffb1f5d
Import translations. DO NOT MERGE
...
Change-Id: I537a87991ba50754b8cb80d48bb6c3147b99a62b
Auto-generated-cl: translation import
2014-08-04 18:21:24 +00:00
John Spurlock
1069f17217
am a8473a79: Doze: Follow the notification light.
...
* commit 'a8473a7962291ad292b2a98e8e43ee07eb0cd5c4':
Doze: Follow the notification light.
2014-08-04 15:37:19 +00:00
John Spurlock
cb566aab57
Doze: Follow the notification light.
...
- Send the notification light info up to SystemUI from NoMan.
- Doze mode will now periodically pulse the display (once)
if the notification light is active.
- Change "tease" terminology to "pulse", which is the singular.
Maintain the multi-pulse on buzz-beep-blink for now as extra
emphasis.
- Scrim controller now always takes number of pulses as an arg,
to support a single pulse (used for notification light, and
eventually pickup once available).
- Dial down the display brightness when pulsing.
Bug:15863249
Change-Id: Ifb208a27e82b66cff1d0c04e5b7f758098ea29cf
2014-08-04 11:32:18 -04:00
Christoph Studer
5d2f125176
am 4021914f: Merge "NoMan: Optimize profile badge retrieval" into lmp-dev
...
* commit '4021914fd594f1cb0c3f07047fdc527565b0c7d9':
NoMan: Optimize profile badge retrieval
2014-08-04 14:42:44 +00:00
Torne (Richard Coles)
0b65f61821
am 5deb8d4f: Don\'t let failures to load the null WebView propagate.
...
* commit '5deb8d4fae6cc8f34fdecb24f519da4fab569b6d':
Don't let failures to load the null WebView propagate.
2014-08-04 13:36:20 +00:00
Torne (Richard Coles)
5f3278ba1e
Don't let failures to load the null WebView propagate.
...
We load the null WebView if the real WebView package is not available to
support devices that aren't intended to have a WebView, but this results
in confusing log messages if the real WebView is supposed to be present
but is broken/unloadable for some reason. Since the null WebView is in
the system classpath on devices that should use it, swallow any failures
to load it on the assumption that this is actually just a failure of the
real WebView to be loaded.
Change-Id: I15820da3517daffde6169343c648a4486c0309d7
2014-08-04 14:26:16 +01:00
Christoph Studer
5f4eebd132
am 63cb39a3: Merge "NoMan: Fix speedbump when no low-prio notifs" into lmp-dev
...
* commit '63cb39a348e2a88663c959da5b82cd15517e37f7':
NoMan: Fix speedbump when no low-prio notifs
2014-08-04 12:03:35 +00:00
Christoph Studer
89fdccc6a5
am 728662c8: Merge "Notif: Fix profile badge for stripped RemoteViews" into lmp-dev
...
* commit '728662c89d47fc3719ea15fa2075af8cf4280456':
Notif: Fix profile badge for stripped RemoteViews
2014-08-04 11:57:58 +00:00
Tadashi G. Takaoka
887d8d62a7
am 8b2a9aff: Merge "Fix input method picker using Material design language" into lmp-dev
...
* commit '8b2a9aff89f88ae7784cde4c4f4f52076d6c19bd':
Fix input method picker using Material design language
2014-08-04 11:57:54 +00:00
Jaewan Kim
119e22cddb
am 009d7b75: Merge "Fix typo in tv_content_rating_systems.xml" into lmp-dev
...
* commit '009d7b75746d5bef1a848a3447e5a8dd60c7894c':
Fix typo in tv_content_rating_systems.xml
2014-08-04 11:57:44 +00:00
Christoph Studer
bcb0c5d219
Merge "NoMan: Optimize profile badge retrieval" into lmp-dev
2014-08-04 08:01:05 +00:00
Christoph Studer
7ac80e630d
NoMan: Optimize profile badge retrieval
...
Instead of stuffing the profile badge into extras, store the
originating user and read the badge via UserManager.
Bug: 16735645
Change-Id: Ia5f9b6f113dcbc88581af5308585edcf9b92b88d
2014-08-04 16:27:54 +02:00
Christoph Studer
943aa6778f
Notif: Fix profile badge for stripped RemoteViews
...
Stash the profile badge into the extras such that rebuild() can read
it back.
Bug: 16735645
Change-Id: I620da121615a01c27fb31ee292088701e364d223
2014-08-04 12:26:18 +02:00
Christoph Studer
f40ee13c2a
am fd266000: Notification: Only post-process legacy notifications
...
* commit 'fd266000212b33956d586807c76967b30b815cb6':
Notification: Only post-process legacy notifications
2014-08-03 18:26:34 +00:00
Christoph Studer
1cda67f8b3
Notification: Only post-process legacy notifications
...
Bug: 16522199
Change-Id: I20330f946cee6569c249be1800c3a0e814d79efc
2014-08-03 18:22:46 +00:00
John Spurlock
bd02ee9c6a
am 437821bc: Merge "Battery saver: new policy changes + SystemUI tweaks." into lmp-dev
...
* commit '437821bc8c15937179fa032203f877074924f513':
Battery saver: new policy changes + SystemUI tweaks.
2014-08-03 01:54:25 +00:00
Sandeep Siddhartha
695ab56c74
am fea9117f: Merge "Stop recognition when shutting down VIS" into lmp-dev
...
* commit 'fea9117ff22d0ad3f7e5d807987e95eadf4da1f4':
Stop recognition when shutting down VIS
2014-08-02 01:55:46 +00:00
Sandeep Siddhartha
d8a4628695
am 966134c7: Merge "Add a flag for multiple triggers with same recognition session" into lmp-dev
...
* commit '966134c701c1b8a6f3cf7195dc20414c1d4157e2':
Add a flag for multiple triggers with same recognition session
2014-08-02 01:31:27 +00:00
Dake Gu
26ec988494
am de545505: ActivityTransitionCoordinator: Fix memory leak of ResultReceiver
...
* commit 'de5455053f2aa08b1fa1ed45d21c4b00f62ddb43':
ActivityTransitionCoordinator: Fix memory leak of ResultReceiver
2014-08-01 23:11:32 +00:00
Dake Gu
fc0fc0e341
ActivityTransitionCoordinator: Fix memory leak of ResultReceiver
...
The ActivityTransitionCoordinator is retained by reference from native code.
The coordinator refers to a app's listener which can cause leak.
b/16737906
Change-Id: Ibbb85480b852442f95b00a8d3beff0161bdadb47
2014-08-01 22:53:14 +00:00