Lorenzo Colitti
bbb2c5b28a
Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
2014-10-30 13:27:54 +00:00
Lorenzo Colitti
dc6690867b
Enable 464xlat on wifi.
...
Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec
2014-10-30 20:31:27 +09:00
Lorenzo Colitti
e21a26b3ba
Add support for running 464xlat on wifi as well.
...
1. Add a command to NetworkManagementService to enable/disable
IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
on a wifi network (which means it detected a NAT64), and
correspondingly re-enable offload when the clatd interface
goes down.
This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.
Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
2014-10-30 20:31:26 +09:00
Nicolas Prevot
9710b04f35
Merge "Schedule to write package restrictions." into lmp-mr1-dev
2014-10-30 10:28:20 +00:00
Chris Banes
e436cb39da
Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev
2014-10-30 08:42:37 +00:00
Dongwon Kang
ce34c6d308
TIF: handle inputs holding the overlay view even after the session release
...
Bug: 17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
2014-10-30 13:37:03 +09:00
Dongwon Kang
c1f26faa2d
Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev
2014-10-30 04:32:30 +00:00
Yohei Yukawa
095fa37164
Conditionally allow non-primay profiles to use TextServices
...
With this CL, non-primary profiles become able to use
TextServices (spelling correction services) if and only if
the active spell checker service is the system's one.
Basically this CL just copies the same logic from
InputMethodManagerService that were implemented as
I3bd87b32aec69c3f8d and Id5d4f29017b7ca6844632 with adding
a condition to see if the spell checker is system's one
or not.
Note that this is a tentative solution and can be removed
once TSMS fully supports multiuser.
Also note that this CL heavily relies on the fact that
setting apps isonly running in the current user. This is
because that some risky operations that are exposed from
TSMS are non-public APIs an accessible only from @hide
methods in TextServicesManager, and those @hide methods
are actually used only by the settings app so far.
BUG: 16285536
Change-Id: Iae9045ba5baccd04ed68906e7afb9160677ec4a5
2014-10-30 03:16:59 +00:00
Yigit Boyar
33d9dc46cf
Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
2014-10-30 02:02:15 +00:00
Alan Viverette
a9ba2cdfc1
Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev
2014-10-30 00:52:17 +00:00
Alan Viverette
674a3a21cb
Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
2014-10-30 00:41:44 +00:00
Dongwon Kang
3eefa59e37
TIF: Handle notifyXXX() calls requested before the session initialization
...
Previously, we relied on a handler by posting runnables when the
session is not initialized yet. However, this trick was broken when we
separated the creation procedure into DO_CREATE_SESSION and
DO_NOTIFY_SESSION_CREATED.
Bug: 17909798
Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec
2014-10-30 09:34:56 +09:00
Alan Viverette
d739d7bd8a
Ensure ImageView.setImageResource() always resolves Drawable
...
Fixes no-op on method call after configuration change at the expense
of removing a micro-optimization that wasn't really needed.
BUG: 18178233
Change-Id: I36eccf91b138e4bed34be96d9b87200edeb66938
2014-10-29 17:26:37 -07:00
Alan Viverette
425b1dc88c
Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev
2014-10-30 00:24:28 +00:00
Alan Viverette
104504053d
Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
2014-10-30 00:18:32 +00:00
Alan Viverette
154c2c24dc
Show scroll indicators in AlertDialog
...
BUG: 16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd
2014-10-30 00:18:22 +00:00
Alan Viverette
f296940502
Distinguish unspecified and explicit null values in resources
...
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
2014-10-29 17:09:36 -07:00
kmccormick
f769c98172
am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
...
* commit '4d9872e6ecc221d3c8bbd66b8efee819d12dbb90':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:49:03 +00:00
kmccormick
20dfe399a6
am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '63ee197682bf7cf831950087028b2a81902f92c9':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:48:53 +00:00
kmccormick
4d9872e6ec
am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
...
* commit '1649712f8745f6b62e453b8b4a230374308732ce':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:26:18 +00:00
kmccormick
1649712f87
am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
...
* commit '13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:20:34 +00:00
kmccormick
63ee197682
am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:19:46 +00:00
kmccormick
2b20b9d23a
am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:12:52 +00:00
Adam Lesinski
720a5c51be
Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev
2014-10-29 23:11:54 +00:00
kmccormick
3e92c4a20f
am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:09:23 +00:00
Wale Ogunwale
a232953ea3
Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev
2014-10-29 23:08:21 +00:00
Eric Laurent
c0c1255a93
Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev
2014-10-29 23:07:33 +00:00
kmccormick
13d7ea464e
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
...
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
Fix for:
b/17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
2014-10-29 23:06:46 +00:00
kmccormick
1867f2cfdd
Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
2014-10-29 23:04:29 +00:00
Santos Cordon
1742413b9b
Even more javadocs for telecom.
...
Bug: 18142177
Change-Id: I4eefe422ec66bb9e14fd8a3b1ee2cb24fedbff51
2014-10-29 15:59:50 -07:00
Eric Laurent
8f89feba39
SoundTrigger JNI: fix local reference leak.
...
Bug: 17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53
2014-10-29 15:52:43 -07:00
kmccormick
2022db08ab
Doc update: deliv receipt, rate exceeded, bug fixes.
...
Fix for:
b/17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
2014-10-29 15:49:36 -07:00
Alan Viverette
4e7c562c43
Merge "Update drawable state after updating tint list" into lmp-mr1-dev
2014-10-29 22:20:18 +00:00
Svetoslav
d3786a5931
Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev
2014-10-29 22:17:57 +00:00
Alan Viverette
2d3443fc5a
Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
2014-10-29 22:05:11 +00:00
Alan Viverette
66c0adcfd4
Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev
2014-10-29 22:05:05 +00:00
Alan Viverette
8785a56c8f
Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev
2014-10-29 22:05:01 +00:00
Dianne Hackborn
7ef463168c
Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
2014-10-29 21:55:50 +00:00
Tom Taylor
de48e8809e
Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev
2014-10-29 21:55:33 +00:00
Jeff Hao
b1346d7829
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
2014-10-29 21:47:30 +00:00
Jeff Hao
9f60c08a44
Change boot screen title to "Android is starting" when not upgrading.
...
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
2014-10-29 14:42:39 -07:00
Tyler Gunn
167230987b
Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
2014-10-29 21:32:53 +00:00
Tom Taylor
4aa3684017
Add a missing mms_config constant to SmsManager
...
Bug 18079788
Change-Id: Ifb2040fb8f9e2a7390da74161539afcf3d6b03af
2014-10-29 14:30:37 -07:00
Alan Viverette
79c067c54a
Add setters for window elevation and clipToOutline properties
...
These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.
BUG: 16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69
2014-10-29 14:27:47 -07:00
Ricardo Cervera
9a6fdfe853
docs: Two-page notification fix.
...
Bug: 18108228
Change-Id: I96863766dc3b787af92e8bf71615eee56afbbca9
2014-10-29 14:27:22 -07:00
Alan Viverette
d86d7bce78
Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
2014-10-29 21:14:56 +00:00
Santos Cordon
d9e614fd56
More updates to javadocs for Telecom APIs.
...
Change-Id: I8f8389f521c0d654c9bfdc3ad9670be0d118f480
2014-10-29 14:13:00 -07:00
Vladimir Marko
85d6f29994
Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
2014-10-29 21:12:08 +00:00
Svetoslav
7c053c1e41
Print preview disappearing if printer is changed.
...
This is a regression caused by my previous patch.
Change-Id: I80a0b4d880fd4e48e6a44fac303a4c8204e8ec0d
2014-10-29 13:50:42 -07:00
Chris Wren
755f4021ae
fix build break from mis-named DEBUG flag in SystemUI
...
Change-Id: I55459fe090ae4c159ebdad8b60658b25db29271e
2014-10-29 16:43:51 -04:00