Tony Mantler
de8d933257
Merge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"
2015-11-18 16:47:41 +00:00
Julia Reynolds
1e39a15d97
Merge "Cache notifications less aggressively."
2015-11-18 16:43:54 +00:00
Julia Reynolds
d8df11baea
Merge "Don't recreate remote views that already exist."
2015-11-18 16:37:59 +00:00
Julia Reynolds
6b53135736
Cache notifications less aggressively.
...
Bug: 25694023
Change-Id: Ie8f1b518fdcb72cfbd982908aa30cdb8ebbb2f02
2015-11-18 11:23:31 -05:00
Jason Monk
40af4f3ed3
Merge "Fix build"
2015-11-18 15:41:27 +00:00
Jason Monk
46c4a32ed9
Fix build
...
Change-Id: Ib784f3b8e1f8e5166128a86d07b43859ee803765
2015-11-18 10:40:34 -05:00
George Mount
c36bab34b6
Merge "Properly remove GhostViews when Activity Transition canceled."
2015-11-18 15:37:39 +00:00
Jason Monk
98c204ada8
Merge "Move some stuff to SettingsLib to use for Settings Home"
2015-11-18 15:08:02 +00:00
Jason Monk
4cf95aef83
Move some stuff to SettingsLib to use for Settings Home
...
Change-Id: Id903747069fe83a896132714e580b1a1d7ee895c
2015-11-18 10:06:54 -05:00
Julia Reynolds
089e3e451a
Don't recreate remote views that already exist.
...
Bug: 25582071
Change-Id: Ie56225ec57ab43b2cab5ffb0198f283592e7bcd9
2015-11-18 09:59:57 -05:00
Geoff Mendal
b3197f8c04
Import translations. DO NOT MERGE
...
Change-Id: I49c49dae609cc2b2770652a0979693124f30a824
Auto-generated-cl: translation import
2015-11-18 05:36:36 -08:00
Nicolas Geoffray
5485d81578
Merge "Remove DEBUG_JIT from Zygote flags."
...
am: cf49583bd0
* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
Remove DEBUG_JIT from Zygote flags.
2015-11-18 10:54:19 +00:00
Nicolas Geoffray
cf49583bd0
Merge "Remove DEBUG_JIT from Zygote flags."
2015-11-18 10:47:50 +00:00
Nicolas Geoffray
245ec92b65
Remove DEBUG_JIT from Zygote flags.
...
The flag is being obsolete by the move to JIT.
(cherry picked from commit 9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)
Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
2015-11-18 10:07:53 +00:00
Yohei Yukawa
33e81798fa
Tell the reason why IMMS unbinds IME client.
...
As a preparation to fix Bug 25373872, this introduce an additional
parameter to IInputMethodClient.unbind() so that the IME client
that is running in the application side can know why IMMS needs
to unbind the connection.
In future the "unbindReason" parameter is supposed to be used to
optimize the behavior of IMM runtime running in the application process,
but for now it is not used unless we build the sytem with debug message
enabled. Hence there should be no user-visible change with this CL.
Bug: 25373872
Change-Id: I74e83c8ca9d1d53e31e9c7b5bda1dec6274e59c8
2015-11-17 21:14:42 -08:00
Yohei Yukawa
85d9fed140
Merge "Factor out IMMS#resetCurrentMethodAndClient()."
2015-11-18 03:56:45 +00:00
Dianne Hackborn
c83189b5d6
Fix issue #25673462 : Shamu update from MMB29J -> 29K does not complete
...
The direct path to the package manager returns null on failure, oops!
Change-Id: Id33ea299b605a59b0703dab200bafb754dd66e78
2015-11-17 18:17:57 -08:00
Chong Zhang
0ba005fcc6
Merge "Fix crash with animation specs"
2015-11-18 02:16:33 +00:00
Dianne Hackborn
cc2925c45b
Merge "Fix issue #25727069 : Top sleeping activity overrides foreground service"
2015-11-18 02:05:30 +00:00
Dianne Hackborn
3ea71cf263
Fix issue #25727069 : Top sleeping activity overrides foreground service
...
Change-Id: I9a085cd650604f9d6277ad343bf3c3852324cafc
2015-11-17 18:03:20 -08:00
Siyamed Sinir
4ba0aa598e
TextView setText/append methods set movement method
...
Previously, TextView setText and append methods set the movement
method to LinkMovementMethod only when autoLink was enabled and
Linkify was able to find links in the input text. This CL adds the
case where autoLink is false, linksClickable is true, and the input
text contains ClickableSpans.
Fixes https://code.google.com/p/android/issues/detail?id=2219
Bug: 1712837
Change-Id: Ife4e35bac7f6cb48ad0dac6ecb4b90aec126fc73
2015-11-17 17:56:03 -08:00
Chong Zhang
be2ca45c62
Fix crash with animation specs
...
Change-Id: I72ed5b19aaede0c58ea0b8665409721824ec6480
2015-11-17 17:55:43 -08:00
Jun Mukai
28d5615147
Merge "Introduce animated pointer icon for STYLE_WAIT."
2015-11-18 01:46:58 +00:00
Yohei Yukawa
bc7b526043
Factor out IMMS#resetCurrentMethodAndClient().
...
As a preparation to fix Bug 25373872, this CL does a mechanical
code clean-ups in InputMethodManagerService.
As a follow up of I6c3186050592526fc95c5b27f18e2155acff5ebc, this CL
introduces IMMS#resetCurrentMethodAndClient() to make it clear when we
are resetting both IMMS->IME and IMMS->Apps connections.
This is literally mechanical. No behavior change is intended.
Bug: 25373872
Change-Id: Ia4161854d9da71783fd028fcb79407e4b9463aee
2015-11-17 17:38:41 -08:00
Jun Mukai
808196f139
Introduce animated pointer icon for STYLE_WAIT.
...
Change-Id: I893f8276e09351db6187c553f349008794b95690
2015-11-17 17:36:08 -08:00
Wale Ogunwale
c02f58f718
Merge changes Ib786d55e,Ibcda3d72
...
* changes:
Only add NonClientDecorView when needed
Move management of BackdropFrameRenderer to DecorView
2015-11-18 00:50:25 +00:00
Andreas Gampe
b053cce7ae
Frameworks/base: Make RuntimeAbort more expressive
...
Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."
Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879
2015-11-17 16:38:59 -08:00
Diego Perez
f9281b6dfe
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 am: 14a826380d
...
am: 0b76d094c6
* commit '0b76d094c6e121f21135d851e4ee6ce8b6ee625f':
Fix delegation of methods within inner static classes
2015-11-18 00:13:20 +00:00
Joe LaPenna
01186abc81
Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a am: f7aceb60e3 am: 2900dc2349
...
am: 617bd39465
* commit '617bd39465dd0b77ed2cf353728c2fe97c371b17':
Revert "Don't dispatch when non-interactive and the display is off."
2015-11-18 00:12:02 +00:00
Michael Wright
69e4ce3a6f
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e am: 8aa7e6a21a am: 78f974a0b2
...
am: c173429617
* commit 'c173429617d2a8779f6a4a6ade5a9991f65f751b':
2015-11-18 00:10:45 +00:00
Deepanshu Gupta
00a3f4b32e
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 am: d67897e4fb
...
am: 6058efff69
* commit '6058efff6991e390cfd06540130bdf4407da7522':
2015-11-18 00:09:19 +00:00
Deepanshu Gupta
cd8e8ea0eb
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b am: ef4050128a
...
am: 0a9b4e5f00
* commit '0a9b4e5f00fcc0f785085e642b7894fa14f16e0b':
2015-11-18 00:07:49 +00:00
Deepanshu Gupta
aec98e3a7e
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8
...
am: e45abdb126
* commit 'e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
2015-11-18 00:06:20 +00:00
Michael Wright
1c996ff5b4
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719
...
am: cd00ba1a71
* commit 'cd00ba1a71bbb9edf92a0cc5def975be86207e4e':
2015-11-18 00:04:52 +00:00
Bryce Lee
20ef5a3f44
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 am: e2861471b9
...
am: 52d93db91d
* commit '52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':
2015-11-18 00:03:17 +00:00
Joe LaPenna
5431e73f14
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours am: dbe1804f58 -s ours
...
am: 9cb81aa210 -s ours
* commit '9cb81aa210419ea14ff396fb533ad500094b00f2':
2015-11-18 00:01:52 +00:00
Sanket Padawe
0106bef2fa
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 am: 7bb34d7517
...
am: fc8f7cee01
* commit 'fc8f7cee0124bee1c75f05a18c112e37705836a9':
2015-11-18 00:00:25 +00:00
Deepanshu Gupta
da5929914b
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7
...
am: 9f275ec3fd
* commit '9f275ec3fd422045f95c048905b112c0a93f4d34':
2015-11-17 23:58:48 +00:00
Michael Kwan
4cb17f362e
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours am: b0aae584ea -s ours
...
am: 2c8f3734af -s ours
* commit '2c8f3734afd5f104166bfb045794970414eb5052':
2015-11-17 23:57:12 +00:00
Eino-Ville Talvala
db8822bf0a
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0 am: 579cc90e61
...
am: b39fde2c42
* commit 'b39fde2c42b7bb4450eb40a19c6fe9c4f743bd9d':
2015-11-17 23:47:47 +00:00
Erik Wolsheimer
d4985ff1dc
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f
...
am: 756b0d2ca2
* commit '756b0d2ca2e3bfb137becff666d33eb5734f796f':
2015-11-17 23:46:15 +00:00
Geoff Mendal
47bd2e6883
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours
...
am: 6dff6bc8cd -s ours
* commit '6dff6bc8cde0f71752880b2495d65bd744c11060':
2015-11-17 23:43:53 +00:00
Geoff Mendal
b33916de2a
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours am: ee144ce3ba -s ours
...
am: 73dedf661e -s ours
* commit '73dedf661e8fb6ab77552a715f202dd6c602ddc5':
2015-11-17 23:42:23 +00:00
Wale Ogunwale
8cc5a74c90
Only add NonClientDecorView when needed
...
We were previously adding it to all decor views because it was
required to be able to draw the resizing backdrop. We now manage
the resizing backdrop independently of the NonClientDecorView.
Bug: 25082500
Change-Id: Ib786d55eacd221e5d36a4afca9117d5409499674
2015-11-17 15:41:05 -08:00
Geoff Mendal
6b4b309fa3
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours am: fb17593356 -s ours
...
am: 464ffe98cb -s ours
* commit '464ffe98cb05906430890e767dd422eca8b9466d':
2015-11-17 23:41:01 +00:00
Stephen Hines
e7b1d99617
Merge "Remove unsupported RS graphics API tests." am: 7ea808b177 am: 5a0a713147
...
am: 96761ce3ad
* commit '96761ce3ad66dd29bf4c1586a09c69f214fb4b1d':
Remove unsupported RS graphics API tests.
2015-11-17 23:39:29 +00:00
Rom Lemarchand
7d1428d7f3
resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp.
...
Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f
2015-11-17 15:38:50 -08:00
Michael Wright
ddfdd15c33
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e am: 8aa7e6a21a
...
am: c85b56b0cb -s ours
* commit 'c85b56b0cbdb712a20385df98d2c159b57f82cca':
DO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-17 23:37:53 +00:00
Chad Brubaker
aaffed261c
Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 am: 97f92ce41e
...
am: 1627a091f4
* commit '1627a091f48d1295653d37a580e30f89005fb6e5':
Add NetworkSecurityConfigProvider.install
2015-11-17 23:36:13 +00:00
Deepanshu Gupta
ae03bc0be3
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960
...
am: 377cc4887d
* commit '377cc4887d3557377f63bfe9d179623985c9484e':
Revert "LayoutLib: Fix true transparency in status bar."
2015-11-17 23:34:24 +00:00