OSDN Git Service
Yohei Yukawa [Thu, 19 Nov 2015 03:45:57 +0000 (03:45 +0000)]
Merge "Have ControlledInputConnectionWrapper#toString()."
Sandra Kwan [Thu, 19 Nov 2015 03:45:19 +0000 (03:45 +0000)]
Merge "AccountManager: add startAddAccount API."
Nicolas Geoffray [Thu, 19 Nov 2015 03:25:45 +0000 (03:25 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
cf49583bd0 am:
5485d81578
am:
5462e46d23
* commit '
5462e46d23800bc480d31d73c21d6089ce299d25':
Remove DEBUG_JIT from Zygote flags.
Wale Ogunwale [Thu, 19 Nov 2015 03:23:55 +0000 (03:23 +0000)]
Merge "Fix build breakage."
Wale Ogunwale [Thu, 19 Nov 2015 03:22:49 +0000 (19:22 -0800)]
Fix build breakage.
Change-Id: Ie60b148d61d746de354b12852d4a6db2d82121c5
Diego Perez [Thu, 19 Nov 2015 03:19:00 +0000 (03:19 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am:
603544d4c4 am:
14a826380d am:
0b76d094c6
am:
f9281b6dfe
* commit '
f9281b6dfe94f1df0fac3ddbad846012b0a6fb7d':
Fix delegation of methods within inner static classes
Joe LaPenna [Thu, 19 Nov 2015 03:17:33 +0000 (03:17 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off." am:
f2b9b2d85a am:
f7aceb60e3 am:
2900dc2349 am:
617bd39465
am:
01186abc81
* commit '
01186abc81c721c84a5d588bb7183d811d77f99c':
Revert "Don't dispatch when non-interactive and the display is off."
Michael Wright [Thu, 19 Nov 2015 03:16:03 +0000 (03:16 +0000)]
Deepanshu Gupta [Thu, 19 Nov 2015 03:14:35 +0000 (03:14 +0000)]
Revert "LayoutLib: Fix true transparency in status bar." am:
4ea74d2960 am:
d67897e4fb am:
6058efff69
am:
00a3f4b32e
* commit '
00a3f4b32e321dbe8320e6cb9d9a90f5699b244f':
Deepanshu Gupta [Thu, 19 Nov 2015 03:13:06 +0000 (03:13 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am:
42a893b50b am:
ef4050128a am:
0a9b4e5f00
am:
cd8e8ea0eb
* commit '
cd8e8ea0ebc61d13a66c5abcc1d359a24c152f31':
Deepanshu Gupta [Thu, 19 Nov 2015 03:11:48 +0000 (03:11 +0000)]
Michael Wright [Thu, 19 Nov 2015 03:10:13 +0000 (03:10 +0000)]
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
am:
1c996ff5b4 -s ours
* commit '
1c996ff5b49d2dcfd3d9c50e41006fb70ea01947':
Bryce Lee [Thu, 19 Nov 2015 03:08:54 +0000 (03:08 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3 am:
e2861471b9 am:
52d93db91d
am:
20ef5a3f44
* commit '
20ef5a3f44cb544ed525451bd306fa676e39a7a5':
Joe LaPenna [Thu, 19 Nov 2015 03:07:32 +0000 (03:07 +0000)]
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
am:
5431e73f14 -s ours
* commit '
5431e73f147ca776cbab800c9cac26fd1653e925':
Sanket Padawe [Thu, 19 Nov 2015 03:06:10 +0000 (03:06 +0000)]
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
am:
0106bef2fa
* commit '
0106bef2facf448e674c9795e6c38aaad0e232e7':
Deepanshu Gupta [Thu, 19 Nov 2015 03:04:49 +0000 (03:04 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a am:
80bd5e6fd7 am:
9f275ec3fd
am:
da5929914b
* commit '
da5929914b618678f462c1a24ee042ff25001a0c':
Michael Kwan [Thu, 19 Nov 2015 03:03:18 +0000 (03:03 +0000)]
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
am:
4cb17f362e -s ours
* commit '
4cb17f362e60741c77d9cf56de95a44df0bec648':
Qiwen Zhao [Thu, 19 Nov 2015 02:51:40 +0000 (02:51 +0000)]
Merge "resolve merge conflicts of
7d1428d7f3 to "
Sandra Kwan [Wed, 4 Nov 2015 19:19:47 +0000 (11:19 -0800)]
AccountManager: add startAddAccount API.
Adding startAddAccount API to AccountManager and
AbstractAccountAuthenticator.
Change-Id: I29e1defb2181ece1281534db0e36b28457085148
Wale Ogunwale [Thu, 19 Nov 2015 02:10:32 +0000 (02:10 +0000)]
Merge "Allow apps to set launch bounds for activities."
Wale Ogunwale [Wed, 18 Nov 2015 23:56:57 +0000 (15:56 -0800)]
Allow apps to set launch bounds for activities.
unhide ActivityOptions APIs for setting launch bounds for
an activitiy so apps can use it. Only works on devices that
support PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT.
Bug:
25499677
Change-Id: I75424681f25cbb9fe92f2ed73e6afbab765dab29
Suprabh Shukla [Thu, 19 Nov 2015 00:53:20 +0000 (00:53 +0000)]
Merge "Moving recent tasks information to a user directory"
Yohei Yukawa [Wed, 18 Nov 2015 21:44:14 +0000 (13:44 -0800)]
Have ControlledInputConnectionWrapper#toString().
'dumpsys input_method' does not generate useful information for
InputMethodManager#mIInputContext. It is currently just a default
output of Object#toString().
This CL overrides ControlledInputConnectionWrapper#toString() so that
we can easily understand whether this connection is accepting API calls
from the IME or silently droping those API calls. Note that
ControlledInputConnectionWrapper is not exposed to developers so
overriding #toString() has no effect for application developers.
Bug:
25373872
Change-Id: I89b9d4e15bc1569817bab4d1be429ac6e0462f14
George Mount [Wed, 18 Nov 2015 23:51:52 +0000 (23:51 +0000)]
Merge "Fix leak of Bundled data."
Todd Kennedy [Wed, 18 Nov 2015 23:38:28 +0000 (15:38 -0800)]
resolve merge conflicts of
7d1428d7f3 to master.
Change-Id: If6455063e7b47ad503d8ec15a8f1d2477065d6e8
George Mount [Wed, 18 Nov 2015 19:10:55 +0000 (11:10 -0800)]
Fix leak of Bundled data.
Bug
25776890
Change-Id: Ib67c71e2fa01c902ad2b18f46bcaad73a73955ad
Wale Ogunwale [Wed, 18 Nov 2015 22:53:03 +0000 (22:53 +0000)]
Merge changes I6b641d6b,Id573a309
* changes:
Renamed NonClientDecorView to DecorCaptionView
Control display of shadows for multi-window in DecorView
Chris Craik [Wed, 18 Nov 2015 22:50:54 +0000 (22:50 +0000)]
Merge "Fix layer create properties"
Doris Liu [Wed, 18 Nov 2015 22:44:44 +0000 (22:44 +0000)]
Merge "VectorDrawable native rendering - Step 2 of MANY"
Chris Craik [Wed, 18 Nov 2015 22:42:00 +0000 (14:42 -0800)]
Fix layer create properties
bug:
25753159
Change-Id: Ifa64dbfd8057ae5b390ba0c177627a5325cdd769
Xiaohui Chen [Wed, 18 Nov 2015 22:13:47 +0000 (22:13 +0000)]
Merge "cmds: fix settings command help msg"
Xiaohui Chen [Wed, 18 Nov 2015 22:10:42 +0000 (14:10 -0800)]
cmds: fix settings command help msg
There is a missing white space.
Change-Id: I7e7f4783464a7be02a3b2e1a30a629ed1ebdc913
Xiaohui Chen [Wed, 18 Nov 2015 21:53:15 +0000 (21:53 +0000)]
Merge "Skip dead users when getting primary."
Doris Liu [Tue, 17 Nov 2015 06:48:34 +0000 (22:48 -0800)]
VectorDrawable native rendering - Step 2 of MANY
Introduced PathData in Java, which is effectively a thin layer around the
native instance. PathData holds the verbs and points which is being used
in path morphing/interpolation. The verbs and points can be interpreted
into skia path commands, which is now done in native and therefore saves
a handful of JNI calls during path creation.
Removed the old PathDataNode mechanism and changed the PathEvaluator
to use PathData instead.
Also added tests and a microbench. Also ran CTS tests for VectorDrawable
and AnimatedVectorDrawable, and passed all of the existing tests.
Change-Id: Ia166f5172ff031fe18b154327967f911a62caec1
Xiaohui Chen [Wed, 18 Nov 2015 21:37:32 +0000 (13:37 -0800)]
Skip dead users when getting primary.
Bug:
25769085
Change-Id: I220d175839509e4dbf3f2992a90e9625d0caf825
Ben Kwa [Wed, 18 Nov 2015 21:15:37 +0000 (21:15 +0000)]
Merge "Open the destination dir when a copy notification is tapped."
Aurimas Liutikas [Wed, 18 Nov 2015 21:06:14 +0000 (21:06 +0000)]
Merge "Start saving CheckedTextView checked state."
Vladislav Kaznacheev [Wed, 18 Nov 2015 20:55:35 +0000 (20:55 +0000)]
Merge "Fix broken build"
Vladislav Kaznacheev [Wed, 18 Nov 2015 20:53:45 +0000 (12:53 -0800)]
Fix broken build
Followup to ag/808050
Change-Id: I9912eae6a8c09b90685e19b3a9080b2d557c857b
Felipe Leme [Wed, 18 Nov 2015 20:41:53 +0000 (20:41 +0000)]
Merge "Improves how cornercase scenarios are handled:"
Amith Yamasani [Wed, 18 Nov 2015 20:27:43 +0000 (20:27 +0000)]
Merge "Fix crash in bindService due to uncleared binder identity"
Wale Ogunwale [Wed, 18 Nov 2015 19:44:10 +0000 (11:44 -0800)]
Renamed NonClientDecorView to DecorCaptionView
DecorCaptionView better describes what it does now which is to
display the caption area and control buttons within it.
Change-Id: I6b641d6b117bb8f03656bff93702fc093160851d
Ben Kwa [Fri, 25 Sep 2015 21:48:29 +0000 (14:48 -0700)]
Open the destination dir when a copy notification is tapped.
- Cleanup: rename the "open copy destination" action to "pick copy
destination", which better reflects what it does.
- Move DocumentsIntent from BaseActivity to Shared.
- Rename ACTION_BROWSE_DOCUMENT_ROOT to ACTION_BROWSE for general browsing.
- Use the new ACTION_BROWSE to open the copy destination when copy
notifications are tapped.
BUG=
23137963
Change-Id: I10480b45a16ce716febac5453cb5015d26bb0062
Vladislav Kaznacheev [Wed, 18 Nov 2015 19:13:13 +0000 (19:13 +0000)]
Merge "Implement View.cancelDrag"
Dianne Hackborn [Wed, 18 Nov 2015 19:07:43 +0000 (19:07 +0000)]
Merge "Fix issue #
25673462: Shamu update from MMB29J -> 29K does not complete"
Amith Yamasani [Wed, 18 Nov 2015 18:56:04 +0000 (10:56 -0800)]
Fix crash in bindService due to uncleared binder identity
Clear the calling identity in retrieveServiceLocked before
doing the appop check. It probably needs to be cleared sooner
in general in retrieveServiceLocked(), but that might be a risky
fix. Making this smaller fix to keep it surgical for now.
Bug:
25759739
Change-Id: I66a5f8ef9b2d914181925fa344c3f2962030583d
Doris Liu [Wed, 18 Nov 2015 18:53:49 +0000 (18:53 +0000)]
Merge "Fix crash on second screenshot."
Felipe Leme [Wed, 18 Nov 2015 18:26:10 +0000 (10:26 -0800)]
Improves how cornercase scenarios are handled:
- Bug reports without screenshots are supported.
- Shows a toast message when the bugreport file cannot be read.
BUG:
25751868
Change-Id: I4ed2c47a89b373cf878720ebcba90c96bd51342b
Wale Ogunwale [Wed, 18 Nov 2015 18:33:22 +0000 (10:33 -0800)]
Control display of shadows for multi-window in DecorView
Allows us to display shadows without needing the NonClientDecorView.
For example, windows in pinned stack don't have a NonClientDecorView.
Bug:
25006507
Change-Id: Id573a30942a9bfcd002b86f0956d0b2a14ec2c2b
Siyamed Sinir [Wed, 18 Nov 2015 18:32:22 +0000 (18:32 +0000)]
Merge "TextView setText/append methods set movement method"
Yohei Yukawa [Wed, 18 Nov 2015 18:15:18 +0000 (18:15 +0000)]
Merge "Tell the reason why IMMS unbinds IME client."
Nicolas Geoffray [Wed, 18 Nov 2015 17:21:41 +0000 (17:21 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
cf49583bd0
am:
5485d81578
* commit '
5485d815788e4037829d70d041fe4fc1a35416f3':
Remove DEBUG_JIT from Zygote flags.
Filip Gruszczynski [Wed, 18 Nov 2015 17:21:38 +0000 (17:21 +0000)]
Merge "Make recents visible on resume unless requested otherwise."
Filip Gruszczynski [Wed, 18 Nov 2015 17:04:13 +0000 (17:04 +0000)]
Merge "Swtich from max_action_buttons resource to a method."
Filip Gruszczynski [Wed, 18 Nov 2015 16:58:34 +0000 (08:58 -0800)]
Make recents visible on resume unless requested otherwise.
If the last interaction left recents invisible, we need to make the
visible again on their next resume.
Bug:
25754031
Change-Id: I4b1d4bae5609bf3f4a77250d3544084afd594536
Tony Mantler [Wed, 18 Nov 2015 16:47:41 +0000 (16:47 +0000)]
Merge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"
Julia Reynolds [Wed, 18 Nov 2015 16:43:54 +0000 (16:43 +0000)]
Merge "Cache notifications less aggressively."
Julia Reynolds [Wed, 18 Nov 2015 16:37:59 +0000 (16:37 +0000)]
Merge "Don't recreate remote views that already exist."
Julia Reynolds [Wed, 18 Nov 2015 16:12:53 +0000 (11:12 -0500)]
Cache notifications less aggressively.
Bug:
25694023
Change-Id: Ie8f1b518fdcb72cfbd982908aa30cdb8ebbb2f02
Jason Monk [Wed, 18 Nov 2015 15:41:27 +0000 (15:41 +0000)]
Merge "Fix build"
Jason Monk [Wed, 18 Nov 2015 15:40:34 +0000 (10:40 -0500)]
Fix build
Change-Id: Ib784f3b8e1f8e5166128a86d07b43859ee803765
George Mount [Wed, 18 Nov 2015 15:37:39 +0000 (15:37 +0000)]
Merge "Properly remove GhostViews when Activity Transition canceled."
Jason Monk [Wed, 18 Nov 2015 15:08:02 +0000 (15:08 +0000)]
Merge "Move some stuff to SettingsLib to use for Settings Home"
Jason Monk [Mon, 16 Nov 2015 20:59:53 +0000 (15:59 -0500)]
Move some stuff to SettingsLib to use for Settings Home
Change-Id: Id903747069fe83a896132714e580b1a1d7ee895c
Julia Reynolds [Wed, 18 Nov 2015 14:59:57 +0000 (09:59 -0500)]
Don't recreate remote views that already exist.
Bug:
25582071
Change-Id: Ie56225ec57ab43b2cab5ffb0198f283592e7bcd9
Geoff Mendal [Wed, 18 Nov 2015 13:36:36 +0000 (05:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I49c49dae609cc2b2770652a0979693124f30a824
Auto-generated-cl: translation import
Nicolas Geoffray [Wed, 18 Nov 2015 10:54:19 +0000 (10:54 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
am:
cf49583bd0
* commit '
cf49583bd02d01b5d7aa57912d5469b466722c65':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 10:47:50 +0000 (10:47 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
Nicolas Geoffray [Thu, 5 Nov 2015 11:29:42 +0000 (11:29 +0000)]
Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.
(cherry picked from commit
9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)
Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
Yohei Yukawa [Wed, 18 Nov 2015 05:14:42 +0000 (21:14 -0800)]
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
Yohei Yukawa [Wed, 18 Nov 2015 03:56:45 +0000 (03:56 +0000)]
Merge "Factor out IMMS#resetCurrentMethodAndClient()."
Dianne Hackborn [Tue, 17 Nov 2015 02:07:35 +0000 (18:07 -0800)]
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
Chong Zhang [Wed, 18 Nov 2015 02:16:33 +0000 (02:16 +0000)]
Merge "Fix crash with animation specs"
Dianne Hackborn [Wed, 18 Nov 2015 02:05:30 +0000 (02:05 +0000)]
Merge "Fix issue #
25727069: Top sleeping activity overrides foreground service"
Dianne Hackborn [Tue, 17 Nov 2015 19:14:43 +0000 (11:14 -0800)]
Fix issue #
25727069: Top sleeping activity overrides foreground service
Change-Id: I9a085cd650604f9d6277ad343bf3c3852324cafc
Siyamed Sinir [Mon, 16 Nov 2015 23:39:34 +0000 (15:39 -0800)]
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
Chong Zhang [Wed, 18 Nov 2015 01:55:43 +0000 (17:55 -0800)]
Fix crash with animation specs
Change-Id: I72ed5b19aaede0c58ea0b8665409721824ec6480
Jun Mukai [Wed, 18 Nov 2015 01:46:58 +0000 (01:46 +0000)]
Merge "Introduce animated pointer icon for STYLE_WAIT."
Yohei Yukawa [Wed, 18 Nov 2015 01:38:41 +0000 (17:38 -0800)]
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
Jun Mukai [Wed, 28 Oct 2015 23:46:44 +0000 (16:46 -0700)]
Introduce animated pointer icon for STYLE_WAIT.
Change-Id: I893f8276e09351db6187c553f349008794b95690
Wale Ogunwale [Wed, 18 Nov 2015 00:50:25 +0000 (00:50 +0000)]
Merge changes Ib786d55e,Ibcda3d72
* changes:
Only add NonClientDecorView when needed
Move management of BackdropFrameRenderer to DecorView
Diego Perez [Wed, 18 Nov 2015 00:13:20 +0000 (00:13 +0000)]
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
Joe LaPenna [Wed, 18 Nov 2015 00:12:02 +0000 (00:12 +0000)]
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."
Michael Wright [Wed, 18 Nov 2015 00:10:45 +0000 (00:10 +0000)]
Deepanshu Gupta [Wed, 18 Nov 2015 00:09:19 +0000 (00:09 +0000)]
Revert "LayoutLib: Fix true transparency in status bar." am:
4ea74d2960 am:
d67897e4fb
am:
6058efff69
* commit '
6058efff6991e390cfd06540130bdf4407da7522':
Deepanshu Gupta [Wed, 18 Nov 2015 00:07:49 +0000 (00:07 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am:
42a893b50b am:
ef4050128a
am:
0a9b4e5f00
* commit '
0a9b4e5f00fcc0f785085e642b7894fa14f16e0b':
Deepanshu Gupta [Wed, 18 Nov 2015 00:06:20 +0000 (00:06 +0000)]
LayoutLib: IntelliJ changed project files. am:
22931224d9 am:
66840955d8
am:
e45abdb126
* commit '
e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
Michael Wright [Wed, 18 Nov 2015 00:04:52 +0000 (00:04 +0000)]
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':
Bryce Lee [Wed, 18 Nov 2015 00:03:17 +0000 (00:03 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3 am:
e2861471b9
am:
52d93db91d
* commit '
52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':
Joe LaPenna [Wed, 18 Nov 2015 00:01:52 +0000 (00:01 +0000)]
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':
Sanket Padawe [Wed, 18 Nov 2015 00:00:25 +0000 (00:00 +0000)]
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':
Deepanshu Gupta [Tue, 17 Nov 2015 23:58:48 +0000 (23:58 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a am:
80bd5e6fd7
am:
9f275ec3fd
* commit '
9f275ec3fd422045f95c048905b112c0a93f4d34':
Michael Kwan [Tue, 17 Nov 2015 23:57:12 +0000 (23:57 +0000)]
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':
Eino-Ville Talvala [Tue, 17 Nov 2015 23:47:47 +0000 (23:47 +0000)]
Erik Wolsheimer [Tue, 17 Nov 2015 23:46:15 +0000 (23:46 +0000)]
Geoff Mendal [Tue, 17 Nov 2015 23:43:53 +0000 (23:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
812794f0f5 -s ours
am:
6dff6bc8cd -s ours
* commit '
6dff6bc8cde0f71752880b2495d65bd744c11060':
Geoff Mendal [Tue, 17 Nov 2015 23:42:23 +0000 (23:42 +0000)]
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':
Wale Ogunwale [Tue, 17 Nov 2015 23:41:05 +0000 (15:41 -0800)]
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
Geoff Mendal [Tue, 17 Nov 2015 23:41:01 +0000 (23:41 +0000)]
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':
Stephen Hines [Tue, 17 Nov 2015 23:39:29 +0000 (23:39 +0000)]
Merge "Remove unsupported RS graphics API tests." am:
7ea808b177 am:
5a0a713147
am:
96761ce3ad
* commit '
96761ce3ad66dd29bf4c1586a09c69f214fb4b1d':
Remove unsupported RS graphics API tests.