OSDN Git Service
Kenny Guy [Fri, 22 Aug 2014 14:37:46 +0000 (14:37 +0000)]
am
1b637e65: am
28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev
* commit '
1b637e652374daa50524623852fd3cdc868a8117':
Fix notification badge when line 3 not shown.
Christoph Studer [Fri, 22 Aug 2014 14:37:40 +0000 (14:37 +0000)]
am
6cddeb73: am
2af8bb02: Merge "SysUI: Fix NotificationData dump" into lmp-dev
* commit '
6cddeb7337d1f8649dd94a4aec08e16f2cf1b2a0':
SysUI: Fix NotificationData dump
Adrian Roos [Fri, 22 Aug 2014 14:37:35 +0000 (14:37 +0000)]
am
0fd731bd: am
d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev
* commit '
0fd731bd1c1572a11d119172c6b3e13e3719b568':
Only run TrustAgentServices for users with secure keyguards
Kenny Guy [Fri, 22 Aug 2014 14:26:56 +0000 (14:26 +0000)]
am
28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev
* commit '
28088d5b3b58a815910e815347cf38e8093a7d7a':
Fix notification badge when line 3 not shown.
Christoph Studer [Fri, 22 Aug 2014 14:26:50 +0000 (14:26 +0000)]
am
2af8bb02: Merge "SysUI: Fix NotificationData dump" into lmp-dev
* commit '
2af8bb0244633292d0143f9204363db1919166cf':
SysUI: Fix NotificationData dump
Adrian Roos [Fri, 22 Aug 2014 14:26:46 +0000 (14:26 +0000)]
am
d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev
* commit '
d7efee2a4168123572769032b6d37a6324b138cd':
Only run TrustAgentServices for users with secure keyguards
Kenny Guy [Fri, 22 Aug 2014 14:20:30 +0000 (14:20 +0000)]
Merge "Fix notification badge when line 3 not shown." into lmp-dev
Christoph Studer [Fri, 22 Aug 2014 14:18:03 +0000 (14:18 +0000)]
Merge "SysUI: Fix NotificationData dump" into lmp-dev
Adrian Roos [Fri, 22 Aug 2014 14:17:31 +0000 (14:17 +0000)]
Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev
Christoph Studer [Thu, 21 Aug 2014 14:41:45 +0000 (16:41 +0200)]
SysUI: Fix NotificationData dump
Inactive notification count and indices were off.
Change-Id: I6e8555fe7dcaf6e7f999f09fb4cda56622928b07
John Spurlock [Fri, 22 Aug 2014 13:39:43 +0000 (13:39 +0000)]
am
e12bd4d1: am
4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev
* commit '
e12bd4d1c3cb9b0ff852c13f33efc49b3229da5c':
QS: Repoint Wifi + BT dual tile labels to settings.
John Spurlock [Fri, 22 Aug 2014 13:39:39 +0000 (13:39 +0000)]
am
43a6f7ac: am
a15effc2: Merge "Don\'t do ambient display when in power-conservation mode." into lmp-dev
* commit '
43a6f7acf9e50dc3005ac358d020bb63e9cb1476':
Don't do ambient display when in power-conservation mode.
Jorim Jaggi [Fri, 22 Aug 2014 13:39:34 +0000 (13:39 +0000)]
am
df0fc631: am
f229ee63: Merge "Content description for padlock icon depending on state" into lmp-dev
* commit '
df0fc631614177fe95cec5ab2adaa131eb2d9a19':
Content description for padlock icon depending on state
John Spurlock [Fri, 22 Aug 2014 13:30:24 +0000 (13:30 +0000)]
am
4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev
* commit '
4ebb638496a76b1810a655e9196bf41641690a48':
QS: Repoint Wifi + BT dual tile labels to settings.
John Spurlock [Fri, 22 Aug 2014 13:30:20 +0000 (13:30 +0000)]
am
a15effc2: Merge "Don\'t do ambient display when in power-conservation mode." into lmp-dev
* commit '
a15effc2f830a13c9b5a997b1c132e56ea5b6e9c':
Don't do ambient display when in power-conservation mode.
Jorim Jaggi [Fri, 22 Aug 2014 13:30:15 +0000 (13:30 +0000)]
am
f229ee63: Merge "Content description for padlock icon depending on state" into lmp-dev
* commit '
f229ee632cdf798ef2b1b68a438cd63ca7bbded9':
Content description for padlock icon depending on state
John Spurlock [Fri, 22 Aug 2014 13:27:46 +0000 (13:27 +0000)]
Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev
John Spurlock [Fri, 22 Aug 2014 13:27:28 +0000 (13:27 +0000)]
Merge "Don't do ambient display when in power-conservation mode." into lmp-dev
Jorim Jaggi [Fri, 22 Aug 2014 13:21:45 +0000 (13:21 +0000)]
Merge "Content description for padlock icon depending on state" into lmp-dev
John Spurlock [Fri, 22 Aug 2014 13:15:52 +0000 (13:15 +0000)]
am
6fa1365b: am
36902e93: Merge "Doze: Improve icon treatment when dozing." into lmp-dev
* commit '
6fa1365bf0e9c5c192dec84e10f6baea23dd07ee':
Doze: Improve icon treatment when dozing.
John Spurlock [Fri, 22 Aug 2014 13:06:48 +0000 (13:06 +0000)]
am
36902e93: Merge "Doze: Improve icon treatment when dozing." into lmp-dev
* commit '
36902e93d806da8766c483e4271ac72945927d23':
Doze: Improve icon treatment when dozing.
John Spurlock [Thu, 21 Aug 2014 20:43:45 +0000 (16:43 -0400)]
Don't do ambient display when in power-conservation mode.
Finish SystemUI's doze dream early when we enter saver mode.
Bug:
17164834
Change-Id: I79153be34da8c4b6447acf5dc9f93364906b2bab
John Spurlock [Fri, 22 Aug 2014 12:59:15 +0000 (12:59 +0000)]
Merge "Doze: Improve icon treatment when dozing." into lmp-dev
Kenny Guy [Thu, 24 Jul 2014 18:54:37 +0000 (19:54 +0100)]
Fix notification badge when line 3 not shown.
Ongoing notifications from chrome and drive
don't have content in line 3 so profile badge
wasn't shown.
Add profile badge to large notifications which
hide line 3.
Bug:
16366324
Change-Id: Ib4f1e888674743aa8ef93b7eaceae72602d8df4d
Narayan Kamath [Fri, 22 Aug 2014 11:56:53 +0000 (11:56 +0000)]
am
3a5f2493: am
00e947b5: Remove a line that was accidentally committed.
* commit '
3a5f24936a9115203ba2661ce8be2a6ba49fd1e1':
Remove a line that was accidentally committed.
Narayan Kamath [Fri, 22 Aug 2014 11:47:01 +0000 (11:47 +0000)]
am
00e947b5: Remove a line that was accidentally committed.
* commit '
00e947b545dd6c193907d0a3d94d30fc59d6e54d':
Remove a line that was accidentally committed.
Narayan Kamath [Fri, 22 Aug 2014 11:35:04 +0000 (12:35 +0100)]
Remove a line that was accidentally committed.
Prevents the APK from being installed.
bug:
17153971
Change-Id: Ic53c94dc6f0583371965d5edb0b12248c915214e
Yohei Yukawa [Fri, 22 Aug 2014 09:17:28 +0000 (09:17 +0000)]
am
3756a2e2: am
dc42737e: Remove CursorAnchorInfoRequest and related stuff
* commit '
3756a2e2b17bee21d729c99488635d7d93010ce0':
Remove CursorAnchorInfoRequest and related stuff
Yohei Yukawa [Fri, 22 Aug 2014 09:06:39 +0000 (09:06 +0000)]
am
dc42737e: Remove CursorAnchorInfoRequest and related stuff
* commit '
dc42737ef203189df65f385bc370c7e19d3968fd':
Remove CursorAnchorInfoRequest and related stuff
Narayan Kamath [Fri, 22 Aug 2014 08:03:34 +0000 (08:03 +0000)]
am
219e4501: am
089f9feb: Merge "Fix service tests." into lmp-dev
* commit '
219e45010ecc695df42a13d76192afb714a8656b':
Fix service tests.
Yohei Yukawa [Fri, 22 Aug 2014 01:38:44 +0000 (18:38 -0700)]
Remove CursorAnchorInfoRequest and related stuff
This CL removes CursorAnchorInfoRequest and related stuff
in favor of InputConnection.requestUpdateCursorAnchorInfo,
which is more easy to understand. This CL also deprecates
InputMethodManager#updateCursor and related stuff.
Rationale:
1. The spec of #updateCursor says that it provides the cursor
position in local coordinates, while the input method
requires it in the screen coordinates.
2. #updateCursor has never been enabled in AOSP, because
InputMethodManager#isWatchingCursor always returned false.
3. There has been no way to let
InputMethodManager#isWatchingCursor return true.
4. In L, InputMethodManager#updateCursorAnchorInfo is
introduced to address all the issues above.
Given that we no longer need to support #updateCursor,
CursorAnchorInfoRequest is overkill when we need to convey
just a couple of parameters.
BUG:
17185263
BUG:
17182367
Change-Id: I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef
Narayan Kamath [Fri, 22 Aug 2014 07:54:39 +0000 (07:54 +0000)]
am
089f9feb: Merge "Fix service tests." into lmp-dev
* commit '
089f9feb0913b4e9d3c854d8b0540573e8a8f0c9':
Fix service tests.
Narayan Kamath [Fri, 22 Aug 2014 07:47:36 +0000 (07:47 +0000)]
Merge "Fix service tests." into lmp-dev
Jungshik Jang [Fri, 22 Aug 2014 06:57:55 +0000 (06:57 +0000)]
am
32c63a97: am
b66b5991: Add spam-safe logger.
* commit '
32c63a97fcd1c96533b9e6198eb4f69b62249607':
Add spam-safe logger.
Jungshik Jang [Fri, 22 Aug 2014 06:48:06 +0000 (06:48 +0000)]
am
b66b5991: Add spam-safe logger.
* commit '
b66b59918313532d36c557ad66b585a849566169':
Add spam-safe logger.
Jungshik Jang [Fri, 22 Aug 2014 04:49:55 +0000 (13:49 +0900)]
Add spam-safe logger.
This change introduces a new helper class, HdmiLogger,
which prevents spammy log for same error message.
Bug:
17179667
Change-Id: Ia55808408e0a92b0370cd627361f80754b2f1018
Stephen Hines [Fri, 22 Aug 2014 06:20:32 +0000 (23:20 -0700)]
resolved conflicts for merge of
5a2d0432 to lmp-dev-plus-aosp
Change-Id: I59be35e67ab2b4709f27c39916b6aebc1abba56f
Stephen Hines [Fri, 22 Aug 2014 05:38:03 +0000 (05:38 +0000)]
am
7a16ffe2: Merge "Replace NULL macros with nullptr literals."
* commit '
7a16ffe2e5eed6d299673f8a3061f1a12b3d3ab8':
Replace NULL macros with nullptr literals.
Jungshik Jang [Fri, 22 Aug 2014 05:38:01 +0000 (05:38 +0000)]
am
ebe59a04: am
952e276a: Merge "Implement interfaces for MHL scratchpad command" into lmp-dev
* commit '
ebe59a04fb308713eeb5a546aa8568c7b2177937':
Implement interfaces for MHL scratchpad command
Jungshik Jang [Fri, 22 Aug 2014 05:28:10 +0000 (05:28 +0000)]
am
952e276a: Merge "Implement interfaces for MHL scratchpad command" into lmp-dev
* commit '
952e276a42082a67dd68a37017a71511ca48b7bd':
Implement interfaces for MHL scratchpad command
Stephen Hines [Fri, 22 Aug 2014 05:27:55 +0000 (05:27 +0000)]
Merge "Replace NULL macros with nullptr literals."
Jungshik Jang [Fri, 22 Aug 2014 05:22:44 +0000 (05:22 +0000)]
Merge "Implement interfaces for MHL scratchpad command" into lmp-dev
Chet Haase [Fri, 22 Aug 2014 04:27:49 +0000 (04:27 +0000)]
am
0a0642c3: am
18237f09: Merge "Fix docs for circular reveal" into lmp-dev
* commit '
0a0642c310a6e9248ae16cb6e67a67ca9fe641cd':
Fix docs for circular reveal
Stephen Hines [Fri, 22 Aug 2014 04:27:45 +0000 (04:27 +0000)]
am
900654e0: am
15041ae4: Merge "Clean up RsFountainFbo_intermediates." into lmp-dev
* commit '
900654e005c7af685c3994e683d65fbf542f81a5':
Clean up RsFountainFbo_intermediates.
Chet Haase [Fri, 22 Aug 2014 04:19:19 +0000 (04:19 +0000)]
am
18237f09: Merge "Fix docs for circular reveal" into lmp-dev
* commit '
18237f096cbc3c866b0f35c041760347d29afcb7':
Fix docs for circular reveal
Stephen Hines [Fri, 22 Aug 2014 04:19:14 +0000 (04:19 +0000)]
am
15041ae4: Merge "Clean up RsFountainFbo_intermediates." into lmp-dev
* commit '
15041ae49b99f66778436574c99edf9ac5e96923':
Clean up RsFountainFbo_intermediates.
Chet Haase [Fri, 22 Aug 2014 04:12:49 +0000 (04:12 +0000)]
Merge "Fix docs for circular reveal" into lmp-dev
Stephen Hines [Fri, 22 Aug 2014 04:09:46 +0000 (04:09 +0000)]
Merge "Clean up RsFountainFbo_intermediates." into lmp-dev
Lorenzo Colitti [Fri, 22 Aug 2014 03:35:06 +0000 (03:35 +0000)]
am
f325858e: am
fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev
* commit '
f325858e128c77791d245a9a54aec0dbfc8665f0':
Rework the per-network URL API.
Jinsuk Kim [Fri, 22 Aug 2014 03:28:58 +0000 (03:28 +0000)]
am
5cba826f: am
d71ce526: Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
* commit '
5cba826f3ee994c2439259e43d7130f487b5174a':
CEC: Skip routing control/internal source selection conditionally
Lorenzo Colitti [Fri, 22 Aug 2014 03:15:52 +0000 (03:15 +0000)]
am
fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev
* commit '
fa79cdb6a7b8750cb5f9bf96a6938bf6ba57d105':
Rework the per-network URL API.
Lorenzo Colitti [Fri, 22 Aug 2014 03:07:27 +0000 (03:07 +0000)]
Merge "Rework the per-network URL API." into lmp-dev
Adam Powell [Fri, 22 Aug 2014 02:59:54 +0000 (02:59 +0000)]
am
c178c63a: am
4cccb38e: Merge "Directly propagate Activity titles to action bars" into lmp-dev
* commit '
c178c63a1a4fbc80e3b632fbaa98561dc8a7e470':
Directly propagate Activity titles to action bars
Alan Viverette [Fri, 22 Aug 2014 02:59:37 +0000 (02:59 +0000)]
am
52e093c1: am
5b92ff31: Merge "Add private themes for dialogs spawned from Settings theme" into lmp-dev
* commit '
52e093c1a2a15a75a742fe74509a06a435738116':
Add private themes for dialogs spawned from Settings theme
Winson Chung [Fri, 22 Aug 2014 02:59:31 +0000 (02:59 +0000)]
am
2a5db3ba: am
6181cbf5: Minor tweaks to recents thumbnails.
* commit '
2a5db3bac9b1d716dc051d2e15333885b32e0953':
Minor tweaks to recents thumbnails.
Alan Viverette [Fri, 22 Aug 2014 02:59:26 +0000 (02:59 +0000)]
am
aa311e15: am
37ec02e0: Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev
* commit '
aa311e1599135ab48305e7cde5b219cae72d3f93':
Clean up nullable listeners in date and time picker delegates
Jeff Sharkey [Fri, 22 Aug 2014 02:59:21 +0000 (02:59 +0000)]
am
b81b5176: am
eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into lmp-dev
* commit '
b81b51760e627eec388d2bbf9c27c6e8c46e28de':
Guard against EOF when reading in FileBridge.
Jungshik Jang [Thu, 21 Aug 2014 05:17:05 +0000 (14:17 +0900)]
Implement interfaces for MHL scratchpad command
1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.
2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.
Bug:
17146522
Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
Jinsuk Kim [Fri, 22 Aug 2014 02:29:08 +0000 (02:29 +0000)]
am
d71ce526: Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
* commit '
d71ce526453a7241126a3eace01a852b51566f0c':
CEC: Skip routing control/internal source selection conditionally
Jinsuk Kim [Fri, 22 Aug 2014 02:14:05 +0000 (02:14 +0000)]
Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
Lorenzo Colitti [Thu, 21 Aug 2014 18:45:54 +0000 (11:45 -0700)]
Rework the per-network URL API.
This addresses API council comments.
Bug:
17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
Chet Haase [Fri, 22 Aug 2014 01:55:38 +0000 (18:55 -0700)]
Fix docs for circular reveal
Issue #
17189634 API Review: reveal animation
Change-Id: Iffcec2669368fc95b50ddcba63d0f5c552f49231
Adam Powell [Fri, 22 Aug 2014 01:28:37 +0000 (01:28 +0000)]
am
4cccb38e: Merge "Directly propagate Activity titles to action bars" into lmp-dev
* commit '
4cccb38e70e9c1404f995f0c8b0217a0f99d6009':
Directly propagate Activity titles to action bars
Adam Powell [Fri, 22 Aug 2014 01:18:22 +0000 (01:18 +0000)]
Merge "Directly propagate Activity titles to action bars" into lmp-dev
Alan Viverette [Fri, 22 Aug 2014 01:12:40 +0000 (01:12 +0000)]
am
5b92ff31: Merge "Add private themes for dialogs spawned from Settings theme" into lmp-dev
* commit '
5b92ff31abd081bc029eba9badb392c65927313d':
Add private themes for dialogs spawned from Settings theme
Winson Chung [Fri, 22 Aug 2014 01:12:34 +0000 (01:12 +0000)]
am
6181cbf5: Minor tweaks to recents thumbnails.
* commit '
6181cbf5ba9e6b2ef528767c3f79e77506a6ad59':
Minor tweaks to recents thumbnails.
Alan Viverette [Fri, 22 Aug 2014 01:12:28 +0000 (01:12 +0000)]
am
37ec02e0: Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev
* commit '
37ec02e0d4f71342b2c368863398ac61e612f087':
Clean up nullable listeners in date and time picker delegates
Jeff Sharkey [Fri, 22 Aug 2014 01:12:23 +0000 (01:12 +0000)]
am
eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into lmp-dev
* commit '
eae1f6bbe878b9b03602ff1f0dab56a79f069068':
Guard against EOF when reading in FileBridge.
Adam Powell [Fri, 22 Aug 2014 01:05:53 +0000 (18:05 -0700)]
Directly propagate Activity titles to action bars
Window decor action bars already inherit window title changes if no
explicit action bar title has been set but from an Activity's
perspective setting the activity title is a stronger signal. This is
especially relevant when the activity's action bar has been provided
by the application in the form of a Toolbar.
Bug
17138048
Change-Id: Ibf042cab6bbda3dc29590c09d1a0910b6ba78870
Eino-Ville Talvala [Fri, 22 Aug 2014 01:05:03 +0000 (01:05 +0000)]
am
9c324750: am
4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev
* commit '
9c324750a37db67d00724056942cfe221ad6521f':
Camera2: Fix return type of CaptureFailure#getFrameNumber
Alan Viverette [Fri, 22 Aug 2014 01:03:47 +0000 (01:03 +0000)]
Merge "Add private themes for dialogs spawned from Settings theme" into lmp-dev
Winson Chung [Wed, 20 Aug 2014 22:39:01 +0000 (15:39 -0700)]
Minor tweaks to recents thumbnails.
- Reducing the size of the recents thumbnails
- Skip persisting if we never update the last thumbnail
- Don't bother loading the last thumbnail file descriptor if we have it in memory
- Fixing warning in getting drawable from resource
Change-Id: Ieddaeac75a5e5d80876a9b6b1d50f7cc84c7d6fd
Alan Viverette [Fri, 22 Aug 2014 01:02:01 +0000 (01:02 +0000)]
Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev
Jeff Sharkey [Fri, 22 Aug 2014 00:58:01 +0000 (00:58 +0000)]
Merge "Guard against EOF when reading in FileBridge." into lmp-dev
Jeff Sharkey [Fri, 22 Aug 2014 00:54:29 +0000 (17:54 -0700)]
Guard against EOF when reading in FileBridge.
Bug:
17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322
Eino-Ville Talvala [Fri, 22 Aug 2014 00:52:52 +0000 (00:52 +0000)]
am
4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev
* commit '
4e6326e7e774bc6ebb9f0cd3a4d3c6e1f67fc289':
Camera2: Fix return type of CaptureFailure#getFrameNumber
Eino-Ville Talvala [Fri, 22 Aug 2014 00:46:40 +0000 (00:46 +0000)]
Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev
Jinsuk Kim [Fri, 22 Aug 2014 00:07:40 +0000 (09:07 +0900)]
CEC: Skip routing control/internal source selection conditionally
This is necessary for TV woken up by <Text/Image View On> to override
initial TV source selection/routing control, since the input change
will immediately come from external device.
Bug:
17189114
Change-Id: I4aa1ac31bc7f6ab554e29a9e6065e534e15abd58
Yin-Chia Yeh [Fri, 22 Aug 2014 00:38:04 +0000 (00:38 +0000)]
am
173871c9: am
671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev
* commit '
173871c9cecf3a72907e73a214523a93a8b0d82c':
Camera2: add toString for two params classes
Yin-Chia Yeh [Fri, 22 Aug 2014 00:27:20 +0000 (00:27 +0000)]
am
671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev
* commit '
671ab7d9658449e15315dd84a3a01072462f7e93':
Camera2: add toString for two params classes
Jing Zhao [Fri, 22 Aug 2014 00:22:56 +0000 (00:22 +0000)]
am
98ddde7e: am
7b2ea97b: Make mAutoAttachOnCreation in DcTracker configuable
* commit '
98ddde7ec599136f70d580ad4ebaecd9b53bc5f6':
Make mAutoAttachOnCreation in DcTracker configuable
Jorim Jaggi [Fri, 22 Aug 2014 00:22:51 +0000 (00:22 +0000)]
am
b8ef516c: am
4f952625: Merge "Content description for next alarm" into lmp-dev
* commit '
b8ef516cadb926799e7a825c69e057b80c3c280a':
Content description for next alarm
Yin-Chia Yeh [Fri, 22 Aug 2014 00:20:05 +0000 (00:20 +0000)]
Merge "Camera2: add toString for two params classes" into lmp-dev
Jing Zhao [Fri, 22 Aug 2014 00:13:22 +0000 (00:13 +0000)]
am
7b2ea97b: Make mAutoAttachOnCreation in DcTracker configuable
* commit '
7b2ea97b618804903e323fbd5538b21ba5ef3fbc':
Make mAutoAttachOnCreation in DcTracker configuable
Jorim Jaggi [Fri, 22 Aug 2014 00:13:18 +0000 (00:13 +0000)]
am
4f952625: Merge "Content description for next alarm" into lmp-dev
* commit '
4f952625b83b77b85db3e3dc6d3f9dc26ccf7c67':
Content description for next alarm
Jing Zhao [Wed, 20 Aug 2014 18:51:30 +0000 (13:51 -0500)]
Make mAutoAttachOnCreation in DcTracker configuable
Bug:
17131842
Change-Id: Iba63cff2f8f5b3ed28bde2aca42e91d3693cad54
Jorim Jaggi [Fri, 22 Aug 2014 00:05:45 +0000 (00:05 +0000)]
Merge "Content description for next alarm" into lmp-dev
Santos Cordon [Fri, 22 Aug 2014 00:01:26 +0000 (00:01 +0000)]
am
2c2c1e07: am
b3e396c2: Additional changes for Conference.
* commit '
2c2c1e07c1e9bbaa93a33a0f969707d27a4398c7':
Additional changes for Conference.
Santos Cordon [Thu, 21 Aug 2014 23:54:43 +0000 (23:54 +0000)]
am
b3e396c2: Additional changes for Conference.
* commit '
b3e396c26fe39ad765109090f56adcd51e3dd738':
Additional changes for Conference.
Santos Cordon [Thu, 21 Aug 2014 21:28:11 +0000 (14:28 -0700)]
Additional changes for Conference.
1) Connection.setConference() checked to see if the conference was valid
before setting it. This prevented us from populating child connections
on a new conference until it was added. Now we allow it but dont sent
the update unless the conference has already been sent.
2) removed unnecessary ArrayList<>() wrappers on CopyOnWriteLists.
3) Updated disconnect/hold/unhold so that they are sent to Conference
objects as well as Connection objects.
4) Added support for separating a child conference call.
5) Additional Logging
Bug:
15621105
Bug:
17136172
Change-Id: I939c36bc9694b9d81f0ff582e2fbe335006aa485
Stephen Hines [Thu, 21 Aug 2014 23:34:43 +0000 (16:34 -0700)]
Clean up RsFountainFbo_intermediates.
Change-Id: I5c041bac357466d918d3dd209f36b505fd000852
Jorim Jaggi [Thu, 21 Aug 2014 23:33:33 +0000 (01:33 +0200)]
Content description for next alarm
Also fixes a bug where "status" was read out with TalkBack for no
good reason.
Bug:
15694080
Change-Id: Id295eb70af880d93ff928ebc337b09a8d679120d
Lajos Molnar [Thu, 21 Aug 2014 23:19:28 +0000 (23:19 +0000)]
am
dec5e4be: am
b5935c4c: Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev
* commit '
dec5e4bec824cd0b7bedab542a5aadb337ea7bcc':
MediaCodec: expand documentation on flush/EOS handling and adaptive playback
George Mount [Thu, 21 Aug 2014 23:19:23 +0000 (23:19 +0000)]
am
7f09ecc5: am
c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev
* commit '
7f09ecc574a079a6c0b2b7010f78caf61b1ced05':
Add Parent Change to ChangeTransform
Lajos Molnar [Thu, 21 Aug 2014 23:08:04 +0000 (23:08 +0000)]
am
b5935c4c: Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev
* commit '
b5935c4c85b17edc4c04943376973d8978181176':
MediaCodec: expand documentation on flush/EOS handling and adaptive playback
George Mount [Thu, 21 Aug 2014 23:07:59 +0000 (23:07 +0000)]
am
c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev
* commit '
c559e14dc1be802bcfe15c989e2c66c9df0e327a':
Add Parent Change to ChangeTransform
Lajos Molnar [Thu, 21 Aug 2014 23:05:27 +0000 (23:05 +0000)]
Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev
George Mount [Thu, 21 Aug 2014 23:00:04 +0000 (23:00 +0000)]
Merge "Add Parent Change to ChangeTransform" into lmp-dev
Jorim Jaggi [Thu, 21 Aug 2014 12:51:58 +0000 (14:51 +0200)]
Content description for padlock icon depending on state
Bug:
15694090
Change-Id: I340b67f2036bd4b29388f437ab5bac1f1aabb93e
Dake Gu [Tue, 22 Jul 2014 21:53:53 +0000 (14:53 -0700)]
Add Parent Change to ChangeTransform
Bug
16460123
Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.
Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee