Sandra Kwan
b68be01344
Merge "AccountManager: add startAddAccount API."
2015-11-19 03:45:19 +00:00
Nicolas Geoffray
b8f71add98
Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0 am: 5485d81578
...
am: 5462e46d23
* commit '5462e46d23800bc480d31d73c21d6089ce299d25':
Remove DEBUG_JIT from Zygote flags.
2015-11-19 03:25:45 +00:00
Wale Ogunwale
ab529e0916
Merge "Fix build breakage."
2015-11-19 03:23:55 +00:00
Wale Ogunwale
ff3c66c597
Fix build breakage.
...
Change-Id: Ie60b148d61d746de354b12852d4a6db2d82121c5
2015-11-18 19:22:49 -08:00
Diego Perez
865ad592fe
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
2015-11-19 03:19:00 +00:00
Joe LaPenna
cae4f1222f
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."
2015-11-19 03:17:33 +00:00
Michael Wright
c67cb61f60
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
...
am: 69e4ce3a6f -s ours
* commit '69e4ce3a6f34c90ac6f635ce7a54ce710ea586c9':
2015-11-19 03:16:03 +00:00
Deepanshu Gupta
b5050a292b
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 am: d67897e4fb am: 6058efff69
...
am: 00a3f4b32e
* commit '00a3f4b32e321dbe8320e6cb9d9a90f5699b244f':
2015-11-19 03:14:35 +00:00
Deepanshu Gupta
dba052df56
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b am: ef4050128a am: 0a9b4e5f00
...
am: cd8e8ea0eb
* commit 'cd8e8ea0ebc61d13a66c5abcc1d359a24c152f31':
2015-11-19 03:13:06 +00:00
Deepanshu Gupta
37802f7160
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 am: e45abdb126
...
am: aec98e3a7e
* commit 'aec98e3a7e2727a0b2cb04c7bd896d1424ea7fe4':
2015-11-19 03:11:48 +00:00
Michael Wright
1273bc8ae4
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':
2015-11-19 03:10:13 +00:00
Bryce Lee
260eec1f97
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':
2015-11-19 03:08:54 +00:00
Joe LaPenna
4eb893e852
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':
2015-11-19 03:07:32 +00:00
Sanket Padawe
93df6f8ffe
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':
2015-11-19 03:06:10 +00:00
Deepanshu Gupta
1150fc36eb
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7 am: 9f275ec3fd
...
am: da5929914b
* commit 'da5929914b618678f462c1a24ee042ff25001a0c':
2015-11-19 03:04:49 +00:00
Michael Kwan
3d2cde7b95
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':
2015-11-19 03:03:18 +00:00
Qiwen Zhao
4f78bca781
Merge "resolve merge conflicts of 7d1428d7f3 to master."
2015-11-19 02:51:40 +00:00
Sandra Kwan
7881228736
AccountManager: add startAddAccount API.
...
Adding startAddAccount API to AccountManager and
AbstractAccountAuthenticator.
Change-Id: I29e1defb2181ece1281534db0e36b28457085148
2015-11-18 18:25:08 -08:00
Wale Ogunwale
76415ee500
Merge "Allow apps to set launch bounds for activities."
2015-11-19 02:10:32 +00:00
Wale Ogunwale
7a8fa60962
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
2015-11-18 18:04:45 -08:00
Suprabh Shukla
d93d481ea1
Merge "Moving recent tasks information to a user directory"
2015-11-19 00:53:20 +00:00
George Mount
6e09942a7d
Merge "Fix leak of Bundled data."
2015-11-18 23:51:52 +00:00
Todd Kennedy
17b1c2cf9a
resolve merge conflicts of 7d1428d7f3 to master.
...
Change-Id: If6455063e7b47ad503d8ec15a8f1d2477065d6e8
2015-11-18 15:38:28 -08:00
George Mount
3bbc2ed128
Fix leak of Bundled data.
...
Bug 25776890
Change-Id: Ib67c71e2fa01c902ad2b18f46bcaad73a73955ad
2015-11-18 15:04:01 -08:00
Wale Ogunwale
c38a5d7da1
Merge changes I6b641d6b,Id573a309
...
* changes:
Renamed NonClientDecorView to DecorCaptionView
Control display of shadows for multi-window in DecorView
2015-11-18 22:53:03 +00:00
Chris Craik
780e20a7df
Merge "Fix layer create properties"
2015-11-18 22:50:54 +00:00
Doris Liu
b10a1d8a93
Merge "VectorDrawable native rendering - Step 2 of MANY"
2015-11-18 22:44:44 +00:00
Chris Craik
f559bd1e67
Fix layer create properties
...
bug:25753159
Change-Id: Ifa64dbfd8057ae5b390ba0c177627a5325cdd769
2015-11-18 14:42:00 -08:00
Xiaohui Chen
4d859fdbd3
Merge "cmds: fix settings command help msg"
2015-11-18 22:13:47 +00:00
Xiaohui Chen
60c2e34543
cmds: fix settings command help msg
...
There is a missing white space.
Change-Id: I7e7f4783464a7be02a3b2e1a30a629ed1ebdc913
2015-11-18 14:10:42 -08:00
Xiaohui Chen
228c322c94
Merge "Skip dead users when getting primary."
2015-11-18 21:53:15 +00:00
Doris Liu
804618d086
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
2015-11-18 13:38:23 -08:00
Xiaohui Chen
d3e9e1835b
Skip dead users when getting primary.
...
Bug: 25769085
Change-Id: I220d175839509e4dbf3f2992a90e9625d0caf825
2015-11-18 13:37:32 -08:00
Ben Kwa
4550388a3f
Merge "Open the destination dir when a copy notification is tapped."
2015-11-18 21:15:37 +00:00
Aurimas Liutikas
664e040f7b
Merge "Start saving CheckedTextView checked state."
2015-11-18 21:06:14 +00:00
Vladislav Kaznacheev
5db9136d8d
Merge "Fix broken build"
2015-11-18 20:55:35 +00:00
Vladislav Kaznacheev
88d753291c
Fix broken build
...
Followup to ag/808050
Change-Id: I9912eae6a8c09b90685e19b3a9080b2d557c857b
2015-11-18 12:53:45 -08:00
Felipe Leme
42ca0087de
Merge "Improves how cornercase scenarios are handled:"
2015-11-18 20:41:53 +00:00
Amith Yamasani
ed3a0a78a5
Merge "Fix crash in bindService due to uncleared binder identity"
2015-11-18 20:27:43 +00:00
Wale Ogunwale
62a91d67ce
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
2015-11-18 11:44:10 -08:00
Ben Kwa
84cebbeb69
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
2015-11-18 11:22:30 -08:00
Vladislav Kaznacheev
f91e74d9a9
Merge "Implement View.cancelDrag"
2015-11-18 19:13:13 +00:00
Dianne Hackborn
32bb7bc314
Merge "Fix issue #25673462 : Shamu update from MMB29J -> 29K does not complete"
2015-11-18 19:07:43 +00:00
Amith Yamasani
8fb0e1946b
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
2015-11-18 10:56:04 -08:00
Doris Liu
adad4a623c
Merge "Fix crash on second screenshot."
2015-11-18 18:53:49 +00:00
Felipe Leme
3bf521a32e
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
2015-11-18 10:46:54 -08:00
Wale Ogunwale
2b547c3f30
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
2015-11-18 10:33:22 -08:00
Siyamed Sinir
6fbb5c1ca4
Merge "TextView setText/append methods set movement method"
2015-11-18 18:32:22 +00:00
Yohei Yukawa
711bcdea5f
Merge "Tell the reason why IMMS unbinds IME client."
2015-11-18 18:15:18 +00:00
Nicolas Geoffray
5462e46d23
Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0
...
am: 5485d81578
* commit '5485d815788e4037829d70d041fe4fc1a35416f3':
Remove DEBUG_JIT from Zygote flags.
2015-11-18 17:21:41 +00:00