OSDN Git Service
John Reck [Fri, 19 Dec 2014 23:15:12 +0000 (23:15 +0000)]
am
f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-dev
* commit '
f89dac472366c547e535dfafa8df25bd2d031833':
Tweak RT-animator scheduling
John Reck [Fri, 19 Dec 2014 23:09:47 +0000 (23:09 +0000)]
Merge "Tweak RT-animator scheduling" into lmp-mr1-dev
Svet Ganov [Fri, 19 Dec 2014 22:36:56 +0000 (22:36 +0000)]
am
e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
* commit '
e130d6c14ae2d4a6f703ef452a7e5741d84936a0':
Remove a bad heuristic when determining click location for accessibility.
Svet Ganov [Fri, 19 Dec 2014 22:33:49 +0000 (22:33 +0000)]
Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
Bart Sears [Fri, 19 Dec 2014 21:50:03 +0000 (21:50 +0000)]
am
02aca27f: Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev
* commit '
02aca27f8005ef94c906e599695243a9fd80f68a':
Allow OEM to specify <unavailable-feature>.
Bart Sears [Fri, 19 Dec 2014 21:45:47 +0000 (21:45 +0000)]
Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev
Svet Ganov [Fri, 19 Dec 2014 19:59:18 +0000 (11:59 -0800)]
Remove a bad heuristic when determining click location for accessibility.
As a bride-gap solution to click on partially covered views in accessibility
mode we compute a point on the screen where to send a down/up event pair.
A heuristic we used was that if the action target is covered by a view that
that has a touch listener we consider the target obscured by the one with
the listener. However, this generates false positives, for example the target
is covered by a view that observers touches for scrolling but not clicking.
bug:
18782023
Change-Id: I31ff34011d45667f1eddda47373ec00e4a23dbf6
John Reck [Fri, 19 Dec 2014 19:37:21 +0000 (11:37 -0800)]
Tweak RT-animator scheduling
Bug:
18226391
The issue occurs as a result of a dispatchFrame itself
taking longer than 12ms, the alloted budget. The result
is that a vsync request (which occured at the end) would
miss the vsync that occured 1ms prior to the end of the frame.
As a result it would end up waiting for the following vsync,
essentially dropping to 30fps even though 60 could have been
sustained.
Fix this with a few tweaks.
First, adjust the UI thread's delay bias from (now + 4ms) to
(vsync + 4ms), this prevents RT animators from slowly drifting
if the vsync occurs mid-task.
Second, request a vsync preemptively prior to running callbacks.
This way if any callbacks needs the next vsync and it takes
"too long", we will catch that vsync.
Finally, fix an issue where the display event queue was always
drained & rejected at the end of a task loop. Instead, drain
and reject all stale vsyncs. This still prevents the issue of
both UI thread & RT thread trying to drive 2 frames in a single
pulse, but also allows RT to notice that it missed a vsync
pulse it needed and that it should speed-up a bit in response
Change-Id: I9d6be037737e9283297898cac2e3563453e797cd
Wink Saville [Fri, 19 Dec 2014 19:17:21 +0000 (19:17 +0000)]
am
b5f1e878: Fix build breakage.
* commit '
b5f1e878d1bc245b676a1a2504c30d21a311bf6c':
Fix build breakage.
Jeff Sharkey [Fri, 19 Dec 2014 19:08:55 +0000 (11:08 -0800)]
Allow OEM to specify <unavailable-feature>.
Some single-system-image builds may run on devices that lack
certain hardware features. This change allows the OEM partition to
mark a feature as "unavailable" which overrides the system image.
Bug:
18801291
Change-Id: I0d81144ec92ee9a78c13b223bbba20a4aed23fa0
Wink Saville [Fri, 19 Dec 2014 19:02:01 +0000 (11:02 -0800)]
Fix build breakage.
I rebased a change and didn't compile, my mistake.
Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
Wink Saville [Fri, 19 Dec 2014 18:27:32 +0000 (18:27 +0000)]
am
f73c2d1f: Update mapping between RAF and Network Type.
* commit '
f73c2d1f0b6d55668c19493fba0088a69e6b128f':
Update mapping between RAF and Network Type.
Wink Saville [Wed, 17 Dec 2014 22:38:49 +0000 (14:38 -0800)]
Update mapping between RAF and Network Type.
bug:
18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
Wink Saville [Fri, 19 Dec 2014 18:03:40 +0000 (18:03 +0000)]
am
63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
* commit '
63c79ce4bfef7e8de7939be3de8a539938d9fc4e':
Update mapping between RAF and Network Type.
Wink Saville [Fri, 19 Dec 2014 17:58:50 +0000 (17:58 +0000)]
Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
Eric Laurent [Fri, 19 Dec 2014 17:19:34 +0000 (17:19 +0000)]
am
8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev
* commit '
8d24fe235a6e8f44e32a56a05ab36ed5b35385df':
AudioService: fix permission check.
Eric Laurent [Fri, 19 Dec 2014 17:11:27 +0000 (17:11 +0000)]
Merge "AudioService: fix permission check." into lmp-mr1-dev
Jason Monk [Fri, 19 Dec 2014 15:00:12 +0000 (15:00 +0000)]
am
28fbe040: Merge "Fix missing subscription list changes" into lmp-mr1-dev
* commit '
28fbe04052b95ada3c32d805f26d6d9ad5548d6b':
Fix missing subscription list changes
Jason Monk [Fri, 19 Dec 2014 14:55:47 +0000 (14:55 +0000)]
Merge "Fix missing subscription list changes" into lmp-mr1-dev
Oliver Woodman [Fri, 19 Dec 2014 11:42:17 +0000 (11:42 +0000)]
am
69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev
* commit '
69fd01d3e6e8e94eafdb6d424f92a32ada93096d':
MediaSessionLegacyHelper uses global Application context
Oliver Woodman [Fri, 19 Dec 2014 11:37:01 +0000 (11:37 +0000)]
Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev
Lorenzo Colitti [Fri, 19 Dec 2014 10:41:08 +0000 (10:41 +0000)]
am
7b42f399: Add a lastValidated bit and use it when reporting capabilities.
* commit '
7b42f399430d5d4ace4efbee225bbd3ecd2d4146':
Add a lastValidated bit and use it when reporting capabilities.
Lorenzo Colitti [Fri, 19 Dec 2014 10:41:03 +0000 (10:41 +0000)]
am
d3b8a3e7: Rename validated to everValidated.
* commit '
d3b8a3e77696ecd90ce59a869aaadf1e7804a9c8':
Rename validated to everValidated.
Lorenzo Colitti [Wed, 17 Dec 2014 02:26:49 +0000 (11:26 +0900)]
Add a lastValidated bit and use it when reporting capabilities.
When we switched the way the status bar determines if a
connection is validated from using INET_CONDITION_ACTION
broadcasts to calling getDefaultNetworkCapabilitiesForUser(),
the statusbar stopped displaying ! when a network stopped having
working Internet connectivity. This is because the validated bit
is never set to false once a network is validated.
Fix this, hopefully temporarily, by introducing a new validated
bit that does go back to being false when a network no longer
has working connectivity, and use that bit in
getDefaultNetworkCapabilitiesForUser().
Bug:
18777225
Change-Id: I991c068be50252391d0e64c647fcf2e053dc82f9
Lorenzo Colitti [Wed, 17 Dec 2014 02:14:42 +0000 (11:14 +0900)]
Rename validated to everValidated.
This is a straight rename and thus a complete no-op from a
functionality perspective.
Bug:
18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059
xinhe [Fri, 19 Dec 2014 03:32:58 +0000 (03:32 +0000)]
am
ffe80ab7: Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev
* commit '
ffe80ab7f68d553fbda221e3457f288a3b7baa0a':
take out SIM card, the RSSI Triangle is still full
Eric Laurent [Fri, 19 Dec 2014 01:38:04 +0000 (17:38 -0800)]
AudioService: fix permission check.
Clear caller identity before calling TelecomManager.isInCall().
Bug:
18702149.
Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
Jean-Michel Trivi [Thu, 18 Dec 2014 23:04:25 +0000 (15:04 -0800)]
MediaSessionLegacyHelper uses global Application context
MediaSessionLegacyHelper used a Context passed by an application
which can cause a leak of Activity instances. Use the global
Application context instead.
Also prevent crash if a null Context is supplied (method not
documented as requesting a non-null Context).
Bug
18767503
Change-Id: I8281047d0af233a323f3fc11ababedff848829ec
xinhe [Fri, 19 Dec 2014 00:07:28 +0000 (00:07 +0000)]
Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev
Mike Lockwood [Thu, 18 Dec 2014 22:40:34 +0000 (22:40 +0000)]
am
8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
* commit '
8a0399c442522bf2dab20c688a99d92faa01f9b1':
BluetoothManagerService: Enforce DUMP permission
Mike Lockwood [Thu, 18 Dec 2014 22:33:59 +0000 (22:33 +0000)]
Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
vandwalle [Thu, 18 Dec 2014 22:20:27 +0000 (22:20 +0000)]
am
f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:
18706288" into lmp-mr1-dev
* commit '
f87606fe25acff86807ef0514b478359bcb52f84':
add debug logs to confirm network flapping issue is fixed Bug:
18706288
Mike Lockwood [Thu, 18 Dec 2014 22:16:36 +0000 (14:16 -0800)]
BluetoothManagerService: Enforce DUMP permission
Bug:
18667272
Change-Id: If9a510aa7b5f22b9df1d8b33f0a18183040a8cf6
vandwalle [Thu, 18 Dec 2014 22:16:29 +0000 (22:16 +0000)]
Merge "add debug logs to confirm network flapping issue is fixed Bug:
18706288" into lmp-mr1-dev
Craig Mautner [Thu, 18 Dec 2014 20:26:00 +0000 (20:26 +0000)]
am
2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev
* commit '
2281e7d6a18e4eebea602c8093ec7cb6541f2960':
Make window mgr stack movement track activity mgr
Winson Chung [Thu, 18 Dec 2014 20:25:55 +0000 (20:25 +0000)]
am
a320b217: Merge "Bug
18784289: Fix issue with transition animation callback." into lmp-mr1-dev
* commit '
a320b2176c9e6a5b3f2c3fe6f80ca9b14e088e9a':
Bug
18784289: Fix issue with transition animation callback.
Craig Mautner [Thu, 18 Dec 2014 19:55:49 +0000 (19:55 +0000)]
Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev
Winson Chung [Thu, 18 Dec 2014 19:30:38 +0000 (19:30 +0000)]
Merge "Bug
18784289: Fix issue with transition animation callback." into lmp-mr1-dev
Winson Chung [Wed, 17 Dec 2014 18:12:54 +0000 (10:12 -0800)]
Bug
18784289: Fix issue with transition animation callback.
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback. This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.
Bug:
18784289
Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
Jason Monk [Mon, 15 Dec 2014 17:24:10 +0000 (12:24 -0500)]
Fix missing subscription list changes
A missing @Override let the wrong function try to catch changes
to the subscription list.
The SubscriptionManager returns null when no SIMs are in the device,
so handle null as an empty list of subscriptions.
Bug:
18752587
Change-Id: I20ee1bde3f23828860f57b512662ad54ee51baf0
xinhe [Thu, 18 Dec 2014 18:02:14 +0000 (10:02 -0800)]
take out SIM card, the RSSI Triangle is still full
Bug:
18479509
Change-Id: I96b0e91ae42ad222889c123ebe0c0c1225d9b6a7
Michael Runge [Thu, 18 Dec 2014 01:53:26 +0000 (01:53 +0000)]
am
37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
* commit '
37fed329adec7b339755fde0b38c687f70524e4e':
Increase timeout when uncrypting OTA
Michael Runge [Thu, 18 Dec 2014 01:49:06 +0000 (01:49 +0000)]
Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
Rich Slogar [Thu, 18 Dec 2014 01:42:45 +0000 (01:42 +0000)]
am
6dfc3aab: am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2 automerge:
85e645a
* commit '
6dfc3aab025579d0472d99fc80a1a6af0703240b':
docs: sdk revision 24.0.2
Eric Gilmore [Thu, 18 Dec 2014 01:42:40 +0000 (01:42 +0000)]
am
2195f583: am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs. automerge:
8d2af0f
* commit '
2195f58301824d995959eafab76ddc630bd0344e':
Adding links for the last few files requested by PMs.
Pavel Zhamaitsiak [Thu, 18 Dec 2014 01:34:21 +0000 (01:34 +0000)]
am
3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev
* commit '
3a35934540060441bc9f80cdf86b5013722553e2':
IMS: Set phone account in IMS Conference object
Rich Slogar [Thu, 18 Dec 2014 01:33:53 +0000 (01:33 +0000)]
am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2
automerge:
85e645a
* commit '
85e645ac2bf38186dce177e29f7062a3645c7917':
docs: sdk revision 24.0.2
Eric Gilmore [Thu, 18 Dec 2014 01:32:41 +0000 (01:32 +0000)]
am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs.
automerge:
8d2af0f
* commit '
8d2af0f9daf672183262a226e9c9410c54c133a2':
Adding links for the last few files requested by PMs.
Pavel Zhamaitsiak [Thu, 18 Dec 2014 01:27:36 +0000 (01:27 +0000)]
Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev
Rich Slogar [Thu, 18 Dec 2014 00:58:03 +0000 (00:58 +0000)]
am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2
* commit '
879cffdec9c6206a3d1f3babfef2b2940a72bfa2':
docs: sdk revision 24.0.2
Rich Slogar [Thu, 18 Dec 2014 00:51:56 +0000 (00:51 +0000)]
am
8838a9f0: docs: sdk revision 24.0.2
* commit '
8838a9f083ff2ecc748d70931e21cbd429ad0d45':
docs: sdk revision 24.0.2
Sanket Padawe [Thu, 18 Dec 2014 00:48:48 +0000 (00:48 +0000)]
am
776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev
* commit '
776164da3cd5f64de009f75f9530953fadd8626a':
Removing unwanted tethering profiles from config.xml
Sanket Padawe [Thu, 18 Dec 2014 00:44:06 +0000 (00:44 +0000)]
Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev
Rich Slogar [Tue, 16 Dec 2014 00:58:03 +0000 (16:58 -0800)]
docs: sdk revision 24.0.2
Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
vandwalle [Mon, 15 Dec 2014 23:41:34 +0000 (15:41 -0800)]
add debug logs to confirm network flapping issue is fixed
Bug:
18706288
Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
Winson Chung [Thu, 18 Dec 2014 00:18:53 +0000 (00:18 +0000)]
am
e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug
18769791)" into lmp-mr1-dev
* commit '
e2ed349cfa838223160e83be7df144e2265cdce4':
Removing context ref from AppWidgetHost. (Bug
18769791)
Winson Chung [Thu, 18 Dec 2014 00:15:11 +0000 (00:15 +0000)]
Merge "Removing context ref from AppWidgetHost. (Bug
18769791)" into lmp-mr1-dev
Eric Gilmore [Thu, 18 Dec 2014 00:08:10 +0000 (00:08 +0000)]
am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs.
* commit '
41ea13c8d2e350bb6167b79653f2aa65fa5d84c5':
Adding links for the last few files requested by PMs.
Amit Mahajan [Thu, 18 Dec 2014 00:01:30 +0000 (00:01 +0000)]
am
e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
* commit '
e69b5d68c2a52d867a614ff0ca378de4ec7d0f54':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
Amit Mahajan [Wed, 17 Dec 2014 23:58:09 +0000 (23:58 +0000)]
Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
Eric Gilmore [Wed, 17 Dec 2014 23:56:21 +0000 (23:56 +0000)]
am
fe7b93f4: Adding links for the last few files requested by PMs.
* commit '
fe7b93f4f7fec93650d3faec23f9cf76841d2b9e':
Adding links for the last few files requested by PMs.
Eric Gilmore [Wed, 17 Dec 2014 23:25:51 +0000 (15:25 -0800)]
Adding links for the last few files requested by PMs.
Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
Craig Mautner [Wed, 17 Dec 2014 23:45:03 +0000 (15:45 -0800)]
Make window mgr stack movement track activity mgr
There were situations where the activity manager ActivityStack was
moved to the front but the corresponding window manager TaskStack
was not. This caused the wrong activity to receive focus which led
to Application Not Responding errors.
One path in particular occurred in startActivityUncheckedLocked()
where curTop.task != intentActivity.task and
sourceStack.topActivity().task != sourceRecord.task. In this case
targetStack.moveTaskToFrontLocked() was never called.
This fix forces all calls to ActivityStack.moveToFront() to make
a call to WindowManagerService.moveTaskToTop() and eliminates
redundant calls to moveTaskToTop().
Fixes bug
17721767.
Change-Id: Ibf01389810dd36724eaec5a4a07560144b2f4cef
Amit Mahajan [Wed, 17 Dec 2014 23:42:56 +0000 (15:42 -0800)]
Change to write (create) setting+subid if it does not already exist
when it is queried for the first time.
Bug:
18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
Raph Levien [Wed, 17 Dec 2014 23:14:13 +0000 (23:14 +0000)]
am
078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
* commit '
078ce5fc820d4744f5b1af384e427cedb7e90643':
Revert "Change Linkify leniency to VALID"
Raph Levien [Wed, 17 Dec 2014 23:09:59 +0000 (23:09 +0000)]
am
0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
* commit '
0b6e78d9971c61877ca312801fd8258aec352231':
Preserve leading "+" in phone numbers
Raph Levien [Wed, 17 Dec 2014 23:08:49 +0000 (23:08 +0000)]
Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
Raph Levien [Wed, 17 Dec 2014 23:04:15 +0000 (23:04 +0000)]
Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
Raph Levien [Wed, 17 Dec 2014 22:31:39 +0000 (14:31 -0800)]
Revert "Change Linkify leniency to VALID"
This reverts commit
9dfe86d4102b93885b947917fccee35053cfc9f2.
That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).
The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.
Bug:
18708556
Sanket Padawe [Wed, 17 Dec 2014 22:19:58 +0000 (14:19 -0800)]
Removing unwanted tethering profiles from config.xml
Bug:
18769044
Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug:
18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
Chris Craik [Wed, 17 Dec 2014 22:11:19 +0000 (22:11 +0000)]
am
c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev
* commit '
c748832f759cd7a390a32890530e854b9711eb7c':
Revert overdraw avoidance visualization change
Chris Craik [Wed, 17 Dec 2014 22:07:02 +0000 (22:07 +0000)]
Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev
Jinsuk Kim [Wed, 17 Dec 2014 21:20:08 +0000 (21:20 +0000)]
am
fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
* commit '
fadfe708e6f0c74890fe2b3292a91570f3049215':
CEC: Pass port ID for set_audio_return_channel
Jinsuk Kim [Wed, 17 Dec 2014 21:15:18 +0000 (21:15 +0000)]
Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
Anju Mathapati [Wed, 17 Dec 2014 19:11:21 +0000 (11:11 -0800)]
IMS: Set phone account in IMS Conference object
Get phone account from conference host connection and set
it to ImsConference while constructing
Bug:
18690773
Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
Jeff Davidson [Wed, 17 Dec 2014 20:52:19 +0000 (20:52 +0000)]
Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev
automerge:
cc4f183
* commit '
cc4f18309a2a576b282a399a97a9d64d66713b89':
Add global setting for ephemeral network timeout.
Jeff Davidson [Wed, 17 Dec 2014 20:51:09 +0000 (20:51 +0000)]
Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev
Cheuksan Wang [Wed, 17 Dec 2014 20:45:03 +0000 (20:45 +0000)]
am
e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG:
18005911" into lmp-mr1-dev
* commit '
e8ea164596b3ab2309d7b99fa52aecd056e50e24':
remove actions and calls for the old sms/mms api BUG:
18005911
Cheuksan Wang [Wed, 17 Dec 2014 20:38:06 +0000 (20:38 +0000)]
Merge "remove actions and calls for the old sms/mms api BUG:
18005911" into lmp-mr1-dev
John Spurlock [Wed, 17 Dec 2014 20:18:03 +0000 (20:18 +0000)]
am
e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
* commit '
e7f301a05344376f9065ef09e3b3ef360469bcb3':
Audio policy: Fix deprecated shouldVibrate api.
John Spurlock [Wed, 17 Dec 2014 20:13:00 +0000 (20:13 +0000)]
Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
smain@google.com [Wed, 17 Dec 2014 20:00:48 +0000 (20:00 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs automerge:
b834c72 automerge:
2a53e24
automerge:
c6de288
* commit '
c6de288eabfcb6b3623fb6a6c3dba1071d7e0c78':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
smain@google.com [Wed, 17 Dec 2014 19:57:42 +0000 (19:57 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs automerge:
b834c72
automerge:
2a53e24
* commit '
2a53e24e10654b7f5667899c8a110ef6742c79e3':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
Chris Craik [Wed, 17 Dec 2014 19:10:28 +0000 (11:10 -0800)]
Revert overdraw avoidance visualization change
bug:
18787324
Partial revert of
23d307c8d88f4a3849163b9e5b7cd11d0d4f372c.
Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
Winson Chung [Wed, 17 Dec 2014 18:31:22 +0000 (10:31 -0800)]
Removing context ref from AppWidgetHost. (Bug
18769791)
Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
Jorim Jaggi [Wed, 17 Dec 2014 19:04:42 +0000 (19:04 +0000)]
am
c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev
* commit '
c3059b444fbd30b1344cd5ee3c7030d1e9e5c408':
Fix colored icons in doze mode
Jorim Jaggi [Wed, 17 Dec 2014 18:59:38 +0000 (18:59 +0000)]
Merge "Fix colored icons in doze mode" into lmp-mr1-dev
Nicolas Prevot [Wed, 17 Dec 2014 18:58:26 +0000 (18:58 +0000)]
am
f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
* commit '
f2bd50b2ec0e5d7a25694170e0dc1363465fd24e':
Fix the doc of addCrossProfileIntentFilter.
Jorim Jaggi [Tue, 16 Dec 2014 18:44:41 +0000 (19:44 +0100)]
Fix colored icons in doze mode
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.
Bug:
18537470
Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
Nicolas Prevot [Wed, 17 Dec 2014 18:54:53 +0000 (18:54 +0000)]
Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
Paul Jensen [Wed, 17 Dec 2014 18:36:31 +0000 (18:36 +0000)]
Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev
automerge:
ee8feae
* commit '
ee8feae5d4624e6759e264cc80eac28b0d0af20f':
Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
Paul Jensen [Wed, 17 Dec 2014 18:34:55 +0000 (18:34 +0000)]
Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev
smain@google.com [Wed, 17 Dec 2014 18:03:39 +0000 (18:03 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
automerge:
b834c72
* commit '
b834c72e61943fda18153bb42b3c8bd80d604b0b':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
smain@google.com [Wed, 17 Dec 2014 17:59:00 +0000 (17:59 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
* commit '
4842228377a292698b232f18706ce54cb7f7cc32':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
Nicolas Prevot [Wed, 17 Dec 2014 15:28:29 +0000 (15:28 +0000)]
Fix the doc of addCrossProfileIntentFilter.
Mention that cross-profile-intent-filters only work for activity intents.
BUG:
18776618
Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
Geoff Mendal [Wed, 17 Dec 2014 17:54:19 +0000 (17:54 +0000)]
am
296aa925: (-s ours) Import translations. DO NOT MERGE automerge:
43741a8 -s ours
* commit '
296aa925171b27a87b427575a9a462dc8a8620b2':
Import translations. DO NOT MERGE
smain@google.com [Wed, 17 Dec 2014 17:52:07 +0000 (17:52 +0000)]
Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
smain@google.com [Wed, 17 Dec 2014 17:50:26 +0000 (09:50 -0800)]
make hidden text hidden with negative indent to avoid horizontal scroll
bug:
18721145
Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
Christoph Studer [Wed, 17 Dec 2014 17:50:04 +0000 (17:50 +0000)]
am
e326af3c: am
3eff1e1f: am
92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge:
4328588
* commit '
e326af3cdba9f8e2a1a8626dc48524410d84e6fa':
Fix MediaStyle docs mentioning 2 max actions in compact view