OSDN Git Service
Philip P. Moltmann [Thu, 12 Nov 2015 17:17:30 +0000 (17:17 +0000)]
Merge "Deal correctly with suggested print attributes"
Filip Gruszczynski [Thu, 12 Nov 2015 16:48:34 +0000 (16:48 +0000)]
Merge "Fix missing dock divider."
Winson Chung [Thu, 12 Nov 2015 16:42:20 +0000 (16:42 +0000)]
Merge "Removing hacks to delay app animations until window animations complete."
Wale Ogunwale [Thu, 12 Nov 2015 16:35:44 +0000 (16:35 +0000)]
Merge "Avoid configuration of callback being reset after relayout." am:
cbcafde45e am:
0170fb8281
am:
f98a6f4101
* commit '
f98a6f41019bf41d57d0681c2e1d6859f8704091':
Avoid configuration of callback being reset after relayout.
Filip Gruszczynski [Wed, 11 Nov 2015 23:58:03 +0000 (15:58 -0800)]
Fix missing dock divider.
When invisible the dock divider would have its bounds adjusted to size
0, 0 and that would be sent to Surface Flinger. When it becomes visible
we immediately adjust the size of the surface, but it's too late for
Surface Flinger and it returns wrong size to the renderer. By not
adjusting the dock divider bounds when it's invisible, Surface Flinger
will always hold good size. The position will be adjusted when the
divider gets visible.
Bug:
25612050
Change-Id: Iab0798d6545ae0f8b46eabfe7e4100079779bd06
Wale Ogunwale [Thu, 12 Nov 2015 16:08:34 +0000 (16:08 +0000)]
Merge "Avoid configuration of callback being reset after relayout." am:
cbcafde45e
am:
0170fb8281
* commit '
0170fb8281d4de9364dc51985be26adea3163c0d':
Avoid configuration of callback being reset after relayout.
Wale Ogunwale [Thu, 12 Nov 2015 16:01:22 +0000 (16:01 +0000)]
Merge "Avoid configuration of callback being reset after relayout."
am:
cbcafde45e
* commit '
cbcafde45ec28d62ce674d215c0264f41580d9a6':
Avoid configuration of callback being reset after relayout.
Wale Ogunwale [Thu, 12 Nov 2015 15:55:18 +0000 (15:55 +0000)]
Merge "Avoid configuration of callback being reset after relayout."
Jason Monk [Wed, 28 Oct 2015 18:33:39 +0000 (14:33 -0400)]
Let support preferences use DeviceDefault themes
Change-Id: I5a0f074dfd1b948b1ced9195ae937e2ad80a5f28
Andrei Stingaceanu [Thu, 12 Nov 2015 10:47:07 +0000 (10:47 +0000)]
Merge "Introduce APIs in DPM for setting/getting the device owner info"
Seigo Nonaka [Thu, 12 Nov 2015 06:55:34 +0000 (06:55 +0000)]
Merge "Clear suggestionSpan reference once popup window is closing."
Andre Eisenbach [Thu, 12 Nov 2015 06:16:52 +0000 (06:16 +0000)]
Merge "Move Bluetooth startup to PHASE_ACTIVITY_MANAGER_READY"
riddle_hsu [Thu, 12 Nov 2015 06:07:12 +0000 (14:07 +0800)]
Avoid configuration of callback being reset after relayout.
mPendingConfiguration is a parameter of IWindowSession.relayout.
And IWindowSession.aidl declared "out Configuration outConfig",
it will always create a new configuration for remote side to write.
If remote side does not write (WMS does not have config change),
the new default configuration will be returned.
In original code passes mPendingConfiguration to updateConfiguration
directly, then callbacks (sConfigCallbacks) receive the same
instance of mPendingConfiguration. And because the implementation
of callback may use the configuration after relayout has reset
the configuration to default, then it may have timing that results
"showing hybrid of portrait and landscape modes" which try to fix
in commit
e36d6e27.
To avoid this, always create a copy to updateConfiguration.
MSG_RESIZED_REPORT from dispatchResized also did the same thing.
Related commit:
e36d6e277e49475076b7872d36ea6a5c5b996e9d
694f79b5d1196640d1beb680b7d1fc68e6e77cbd
Change-Id: Ic1abd596e384918224b3a7020583d9a04641cccc
Andre Eisenbach [Thu, 12 Nov 2015 05:43:26 +0000 (21:43 -0800)]
Move Bluetooth startup to PHASE_ACTIVITY_MANAGER_READY
For some reason BluetoothManagerService recently has been unable to bind
to the BluetoothService, causing timeouts, which in turn could lead to
Bluetooth not working immediately after boot.
While refactoring that code, the "get name and address" code was also
removed to make the startup sequence more transparent and easier to
debug.
Bug:
25597150
Change-Id: I62ffe4589a76ea8a6db75e3c7599f149db677ea3
Winson [Thu, 12 Nov 2015 02:11:59 +0000 (18:11 -0800)]
Fixing crash when trying to set thumbnail info.
- The TaskThumbnailInfo can have the same lifecycle as the TaskRecord, and
we should just reset it instead of setting it to null when the thumbnail
is disposed.
Bug:
25652261
Change-Id: I54384e208b19e60d469bf3471dd555f78f04290c
Winson [Wed, 11 Nov 2015 18:39:03 +0000 (10:39 -0800)]
Removing hacks to delay app animations until window animations complete.
- We should have been using onEnterAnimationComplete instead, which is
more reliable and respects the window transition developer option.
Change-Id: Ib7cd2868283cfe0e5fc79863818a614375072e0f
Doris Liu [Thu, 12 Nov 2015 01:56:06 +0000 (01:56 +0000)]
Merge "Add hooks in JNI to start using native path parsing"
Doris Liu [Wed, 11 Nov 2015 22:31:13 +0000 (14:31 -0800)]
Add hooks in JNI to start using native path parsing
Change-Id: Iaa0d3c2c1936c248146ed7f186a13e8e79be818e
Erik Kline [Thu, 12 Nov 2015 01:45:00 +0000 (01:45 +0000)]
Merge "Lower NTP timeout from 20 seconds down to 5 seconds"
Makoto Onuki [Thu, 12 Nov 2015 01:39:44 +0000 (01:39 +0000)]
Merge "Revert "Do not call into ActivityManager from DPMS within DPMS lock""
Makoto Onuki [Thu, 12 Nov 2015 01:38:47 +0000 (01:38 +0000)]
Revert "Do not call into ActivityManager from DPMS within DPMS lock"
Bug
25567963
This reverts commit
53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd.
Change-Id: I4faaa0b4c50d75e208f37b99bc1d6e2f0fff8127
Eino-Ville Talvala [Thu, 12 Nov 2015 01:38:37 +0000 (01:38 +0000)]
Camera: Documentation updates am:
d8407271ff am:
37e78cf8f1 am:
0e57a4d021 am:
7a062ed396
am:
184cefc2ae
* commit '
184cefc2ae33dde0d82a2ee4ed2683b05df9ccc3':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:31:30 +0000 (01:31 +0000)]
Camera: Documentation updates am:
d8407271ff am:
37e78cf8f1 am:
0e57a4d021
am:
7a062ed396
* commit '
7a062ed396f6e563766367de70e0d9c6ba615fed':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:25:02 +0000 (01:25 +0000)]
Camera: Documentation updates am:
d8407271ff am:
37e78cf8f1
am:
0e57a4d021
* commit '
0e57a4d02199a55db763b10a49f383c395e768c7':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:18:12 +0000 (01:18 +0000)]
Camera: Documentation updates am:
d8407271ff
am:
37e78cf8f1
* commit '
37e78cf8f18523cda95926a85ae2b3678ffd7e5e':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:10:07 +0000 (01:10 +0000)]
Camera: Documentation updates
am:
d8407271ff
* commit '
d8407271ffa83d27e9a524f485a0799e422e1fd6':
Camera: Documentation updates
Amith Yamasani [Thu, 12 Nov 2015 00:46:49 +0000 (00:46 +0000)]
Merge "Use correct lock for reading/writing usage stats files"
Jeff Sharkey [Thu, 12 Nov 2015 00:20:27 +0000 (00:20 +0000)]
Merge "More file-based encryption work."
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Documentation updates
- Clarify hardware.camera feature being only for the back camera
- Clarify what setting a CaptureRequest field to null does
- Use preCorrectionActiveArray instead of activeArray in list of
possible raw output sizes
- Clarify length of GPS processing field for camera1 API
Bug:
24540625
Bug:
23908116
Bug:
23051627
Bug:
17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
Daniel Koulomzin [Wed, 11 Nov 2015 23:44:26 +0000 (23:44 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev am:
1090acc958 am:
102e66152a
am:
c549b4fbc4
* commit '
c549b4fbc4fc9330f72050bf92a21ef3e48446e8':
ActivityView gets its own thread pool.
Daniel Koulomzin [Wed, 11 Nov 2015 23:37:13 +0000 (23:37 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev am:
1090acc958
am:
102e66152a
* commit '
102e66152a51e28920da23e2991281f51f2439ee':
ActivityView gets its own thread pool.
Daniel Koulomzin [Wed, 11 Nov 2015 23:28:10 +0000 (23:28 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev
am:
1090acc958
* commit '
1090acc958add85c1332fc73b66258ea4efba69e':
ActivityView gets its own thread pool.
Daniel Koulomzin [Wed, 11 Nov 2015 23:23:18 +0000 (23:23 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool.
Bug:
24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
Ian Pedowitz [Wed, 11 Nov 2015 22:13:11 +0000 (22:13 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am:
88d4cc1001 am:
4f22c781b6 am:
44df02fc17
am:
4ab979e6cc
* commit '
4ab979e6cc0c63b97b79441b478e30c8febdc3ee':
Revert "Fix race condition when setting default ringtones"
Ian Pedowitz [Wed, 11 Nov 2015 22:04:28 +0000 (22:04 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am:
88d4cc1001 am:
4f22c781b6
am:
44df02fc17
* commit '
44df02fc17bb0f3f1c445166c6cbd7f4d92b4eb6':
Revert "Fix race condition when setting default ringtones"
Ian Pedowitz [Wed, 11 Nov 2015 21:54:42 +0000 (21:54 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am:
88d4cc1001
am:
4f22c781b6
* commit '
4f22c781b614322fe3790d314a527ac10471a63a':
Revert "Fix race condition when setting default ringtones"
Chong Zhang [Wed, 11 Nov 2015 21:50:56 +0000 (21:50 +0000)]
Merge "Fixes for dim bounds and touch bounds"
Ian Pedowitz [Wed, 11 Nov 2015 21:46:06 +0000 (21:46 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev
am:
88d4cc1001
* commit '
88d4cc100175a54be3b7d560a91c38197f59f4bf':
Revert "Fix race condition when setting default ringtones"
Ian Pedowitz [Wed, 11 Nov 2015 21:39:11 +0000 (21:39 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev
Ian Pedowitz [Wed, 11 Nov 2015 21:38:04 +0000 (21:38 +0000)]
Revert "Fix race condition when setting default ringtones"
This reverts commit
f2cb9341ff864e6d9cc6797857665b2281643a74.
Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
Rob Carr [Wed, 11 Nov 2015 21:04:35 +0000 (21:04 +0000)]
Merge "Prevent early recent trimming of distinct documents."
Chong Zhang [Wed, 11 Nov 2015 02:36:33 +0000 (18:36 -0800)]
Fixes for dim bounds and touch bounds
- Change dimming and touch related usage to use task's "max visible
bounds", which is the app within a task that's covering the maximum
visible area looking down from top. This solves the problem where
an app pops up a dialog window. We should dimming (and allow touch)
the entire task area, not just the dialog's visible area.
- Fix initial bounds used in drag moving/resizing, this should be
visible bounds of the app main window, not the original task bounds.
- Fix touch region set up for freeform apps, even when task is not
full screen, we should get the max visible bounds first (as freeform
app could have dialogs too).
bug:
25494928
bug:
25487005
bug:
25613403
Change-Id: Ib1c6a1665fb83ded2fcb0a7ea92cf1def5372edd
Amith Yamasani [Wed, 11 Nov 2015 20:46:02 +0000 (12:46 -0800)]
Use correct lock for reading/writing usage stats files
Bug:
25355086
Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3
Chad Brubaker [Wed, 11 Nov 2015 20:46:48 +0000 (20:46 +0000)]
Merge "Add NetworkSecurityConfigProvider" am:
d1c469e876 am:
8c89f4d28c
am:
70b2eede18
* commit '
70b2eede18476f3a7d6344ffdc18b40f07bf4b5f':
Add NetworkSecurityConfigProvider
Amith Yamasani [Wed, 11 Nov 2015 20:45:29 +0000 (20:45 +0000)]
Merge "Fix system watchdog timeout when reading too many usage events." am:
10b0bae06f am:
b3d48f18a9
am:
f12ffe6d76
* commit '
f12ffe6d762f281cbda56322be83a1da80b707ea':
Fix system watchdog timeout when reading too many usage events.
Chad Brubaker [Wed, 11 Nov 2015 20:39:35 +0000 (20:39 +0000)]
Merge "Add NetworkSecurityConfigProvider" am:
d1c469e876
am:
8c89f4d28c
* commit '
8c89f4d28c927ffe81c6e46159d0e5d3a0dd2986':
Add NetworkSecurityConfigProvider
Amith Yamasani [Wed, 11 Nov 2015 20:38:15 +0000 (20:38 +0000)]
Merge "Fix system watchdog timeout when reading too many usage events." am:
10b0bae06f
am:
b3d48f18a9
* commit '
b3d48f18a94c586823462c93fc0f739c83f3db78':
Fix system watchdog timeout when reading too many usage events.
Chad Brubaker [Wed, 11 Nov 2015 20:32:03 +0000 (20:32 +0000)]
Merge "Add NetworkSecurityConfigProvider"
am:
d1c469e876
* commit '
d1c469e8769822c48584034076861331fd792a7c':
Add NetworkSecurityConfigProvider
Amith Yamasani [Wed, 11 Nov 2015 20:30:32 +0000 (20:30 +0000)]
Merge "Fix system watchdog timeout when reading too many usage events."
am:
10b0bae06f
* commit '
10b0bae06ffdeb79494ddd1aff19387b56770960':
Fix system watchdog timeout when reading too many usage events.
Chad Brubaker [Wed, 11 Nov 2015 20:25:04 +0000 (20:25 +0000)]
Merge "Add NetworkSecurityConfigProvider"
Amith Yamasani [Wed, 11 Nov 2015 20:24:39 +0000 (20:24 +0000)]
Merge "Fix system watchdog timeout when reading too many usage events."
Filip Gruszczynski [Wed, 11 Nov 2015 20:07:58 +0000 (20:07 +0000)]
Merge "Fix thumbnail animation appearing on going home transition."
Filip Gruszczynski [Wed, 11 Nov 2015 18:12:04 +0000 (10:12 -0800)]
Fix thumbnail animation appearing on going home transition.
We were not dilligent enough about clearing old state in AppTransition,
so parts of old overrides would bleed to the new state. In order to
improve the situation, we have now a single clear method, that will
clear all state that should be restricted to a single transition.
Bug:
25630796
Change-Id: Icb402d05aaa2d1bd356d55e43502442d8fd8cd23
Amith Yamasani [Wed, 11 Nov 2015 20:05:06 +0000 (20:05 +0000)]
Merge "Once system is provisioned, lock the screen on system user"
Alan Viverette [Wed, 11 Nov 2015 20:00:22 +0000 (20:00 +0000)]
Merge "Pass densityDpi into RippleComponent, store as densityScale"
Wale Ogunwale [Wed, 11 Nov 2015 19:41:33 +0000 (19:41 +0000)]
Merge "Set right bounds/configuration for task when positioned in stack."
Chad Brubaker [Wed, 11 Nov 2015 19:38:13 +0000 (19:38 +0000)]
Merge "Add support for debug-overrides configuration" am:
f1e813ea33 am:
467804448d
am:
3210b8b4da
* commit '
3210b8b4da3c745420d3010028f2bb7071044262':
Add support for debug-overrides configuration
Chad Brubaker [Wed, 11 Nov 2015 19:30:01 +0000 (19:30 +0000)]
Merge "Add support for debug-overrides configuration" am:
f1e813ea33
am:
467804448d
* commit '
467804448d6b13e04b4d9bc20fd195baa1f07e90':
Add support for debug-overrides configuration
Chad Brubaker [Wed, 11 Nov 2015 19:21:32 +0000 (19:21 +0000)]
Merge "Add support for debug-overrides configuration"
am:
f1e813ea33
* commit '
f1e813ea334c947ae0397bfa3a8e42be4fd4ae8c':
Add support for debug-overrides configuration
Chad Brubaker [Wed, 11 Nov 2015 19:03:30 +0000 (19:03 +0000)]
Merge "Add support for debug-overrides configuration"
Amith Yamasani [Tue, 10 Nov 2015 19:11:15 +0000 (11:11 -0800)]
Once system is provisioned, lock the screen on system user
If the device provisioning is complete, check if we need to show
the keyguard. We don't want it to show launcher after finishing
with setupwizard in the system user.
Bug:
25326078
Change-Id: I326069e29122ebf19a59fc00a9120cd5de70f231
Chad Brubaker [Tue, 10 Nov 2015 20:26:18 +0000 (12:26 -0800)]
Add NetworkSecurityConfigProvider
Change-Id: I321e3ca94cc2a8d5e0e5d82a83b255ff5b8a71d2
Jeff Sharkey [Mon, 9 Nov 2015 00:46:05 +0000 (16:46 -0800)]
More file-based encryption work.
Add granular StorageManager APIs for key creation/destruction and
unlocking/locking. Start passing through an opaque token as part
of the unlock command, but leave it empty for now. We now have a
separate "prepare" method that sanity checks that user directories
are correctly setup.
Define a handful of system properties used for marking devices that
should be operating in FBE mode, and if they're emulating FBE. Wire
a command to "sm", but persisting will come later.
Start using new "encryptionAware" flag on apps previously marked with
coreApp flag, which were apps running in the legacy CryptKeeper
model. Small tweaks to handle non-encryptionAware voice interaction
services. Switch PackageManager to consult StorageManager about the
unlocked state of a user.
Bug:
22358539
Change-Id: Ic2865f9b81c10ea39369c441422f7427a3c3c3d6
Svetoslav Ganov [Wed, 11 Nov 2015 18:41:37 +0000 (18:41 +0000)]
Merge "Add the set_test a11y action to EditText's action list"
Philip P. Moltmann [Wed, 11 Nov 2015 18:40:39 +0000 (18:40 +0000)]
Merge "Allow ellipsizing of copy count and media size in PrintActivity main view."
Philip P. Moltmann [Wed, 11 Nov 2015 18:26:25 +0000 (10:26 -0800)]
Allow ellipsizing of copy count and media size in PrintActivity main view.
Bug:
25589299
Change-Id: I231c156de1180b18a140ee8ad896bd4226196bc9
Geoff Mendal [Wed, 11 Nov 2015 18:18:56 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
efa66ca345 -s ours am:
bdc6cd2930 -s ours
am:
6035d3d256 -s ours
* commit '
6035d3d256c9f8e71cdf41a1c6d98afc7d56d1e4':
Import translations. DO NOT MERGE
John Reck [Wed, 11 Nov 2015 18:17:25 +0000 (18:17 +0000)]
Merge "Fix memory corruption in SpotShadow" am:
8c85c00b5e am:
8c8353a8c3
am:
5bb2fdb425
* commit '
5bb2fdb425dab346fb83c7f2bf9afa03bdf79fd6':
Fix memory corruption in SpotShadow
Geoff Mendal [Wed, 11 Nov 2015 18:12:37 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
efa66ca345 -s ours
am:
bdc6cd2930 -s ours
* commit '
bdc6cd29303b12ca2fcd8e865f1bb6550b01652f':
Import translations. DO NOT MERGE
John Reck [Wed, 11 Nov 2015 18:08:15 +0000 (18:08 +0000)]
Merge "Fix memory corruption in SpotShadow" am:
8c85c00b5e
am:
8c8353a8c3
* commit '
8c8353a8c3152bc3ee4b74815d64c65c2c9d1991':
Fix memory corruption in SpotShadow
Geoff Mendal [Wed, 11 Nov 2015 18:03:38 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
efa66ca345 -s ours
* commit '
efa66ca345bc9c82e9f4c88e4e902f935804ab73':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:59:16 +0000 (17:59 +0000)]
Import translations. DO NOT MERGE am:
984f7fb960 -s ours am:
adaccf62be -s ours am:
d00e9f88d7 -s ours
am:
3c8f7b53da -s ours
* commit '
3c8f7b53dae22d5ad8d28a48259eca9f83c66226':
Import translations. DO NOT MERGE
John Reck [Wed, 11 Nov 2015 17:59:16 +0000 (17:59 +0000)]
Merge "Fix memory corruption in SpotShadow"
am:
8c85c00b5e
* commit '
8c85c00b5e8fffb226f4af225a67425b8d0f190b':
Fix memory corruption in SpotShadow
Geoff Mendal [Wed, 11 Nov 2015 17:56:56 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
John Reck [Wed, 11 Nov 2015 17:52:08 +0000 (17:52 +0000)]
Merge "Fix memory corruption in SpotShadow"
Alan Viverette [Wed, 11 Nov 2015 17:51:10 +0000 (12:51 -0500)]
Pass densityDpi into RippleComponent, store as densityScale
Fixes a regression where the foreground was created against the density
in DPI rather than as a scale factor.
Bug:
25602850
Change-Id: Ia871aa5def4319682a73228efb599f31b65afdb6
Geoff Mendal [Wed, 11 Nov 2015 17:49:48 +0000 (17:49 +0000)]
Import translations. DO NOT MERGE am:
984f7fb960 -s ours am:
adaccf62be -s ours
am:
d00e9f88d7 -s ours
* commit '
d00e9f88d704c713a313c18a2f5bc37986e7d6e3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:41:18 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE am:
984f7fb960 -s ours
am:
adaccf62be -s ours
* commit '
adaccf62be5c8b1f44f5dd0c03bff01a2b314896':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:41:18 +0000 (18:41 +0100)]
Import translations. DO NOT MERGE
Change-Id: If1583a01724c6eb81c234b7f2b71c7f276d67a13
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Nov 2015 17:32:10 +0000 (17:32 +0000)]
Import translations. DO NOT MERGE
am:
984f7fb960 -s ours
* commit '
984f7fb9603b55d3031f7df04fa37010513b712c':
Import translations. DO NOT MERGE
Winson Chung [Wed, 11 Nov 2015 17:30:24 +0000 (17:30 +0000)]
Merge "Fixing issue with wrong transition when tasks are offscreen."
Winson [Mon, 9 Nov 2015 18:48:04 +0000 (10:48 -0800)]
Fixing issue with wrong transition when tasks are offscreen.
- Fixing issue with wrong animation specs being created for tasks that
are offscreen
- Removing unused code and simplifying the logic for task launching, also
pulling this out into another file so that it is easier to read and
understand
- Removing old incorrect call to moveTaskToFront() instead of
startActivityFromRecents()
Bug:
25590404
Change-Id: I25d9530d089a7984fb8c94954a34dd124420755a
Geoff Mendal [Wed, 11 Nov 2015 17:23:56 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Calin Juravle [Wed, 11 Nov 2015 17:13:14 +0000 (17:13 +0000)]
Merge "Parse method-trace properties only in debug builds." am:
8fa7e93050 am:
61abae774e
am:
d75fdb6fe3
* commit '
d75fdb6fe3745805561dec630540e8449d97e2f8':
Parse method-trace properties only in debug builds.
Geoff Mendal [Wed, 11 Nov 2015 17:07:16 +0000 (18:07 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ief45ae89cfe3bfd76390f8f70276c2411d0dfc30
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 11 Nov 2015 15:25:50 +0000 (16:25 +0100)]
Make all calls go through mExecutor
So we don't run into race conditions when both the main thread and
the executor thread are calling into window manager.
Bug:
25591212
Change-Id: I6d02170f6b105c9b7b861b6dfc4b76452632d562
Calin Juravle [Wed, 11 Nov 2015 17:05:42 +0000 (17:05 +0000)]
Merge "Parse method-trace properties only in debug builds." am:
8fa7e93050
am:
61abae774e
* commit '
61abae774e7cf3fd298ecab821692ac17417f4c5':
Parse method-trace properties only in debug builds.
Calin Juravle [Wed, 11 Nov 2015 17:00:22 +0000 (17:00 +0000)]
Merge "Parse method-trace properties only in debug builds."
am:
8fa7e93050
* commit '
8fa7e93050f5b3d7ccac8775fee302f1f4394d4f':
Parse method-trace properties only in debug builds.
Calin Juravle [Wed, 11 Nov 2015 16:54:52 +0000 (16:54 +0000)]
Merge "Parse method-trace properties only in debug builds."
Keith Mok [Wed, 11 Nov 2015 00:52:05 +0000 (16:52 -0800)]
Fix memory corruption in SpotShadow
The array list is too small and causing stack corruption
Change-Id: I0e34dad39357fb63977d2ce6f183ced7b6a632be
Geoff Mendal [Wed, 11 Nov 2015 16:48:30 +0000 (17:48 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ibe76b6f6ee50720bae18254f90820a7354601018
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 11 Nov 2015 15:28:37 +0000 (16:28 +0100)]
Don't crash in AppTransition if future returns null
Change-Id: I7e101439093062d8976d74639229a7206308ad22
Jason Monk [Wed, 11 Nov 2015 16:22:21 +0000 (16:22 +0000)]
Merge "Vibrate when the gear gets up to speed"
Jason Monk [Tue, 10 Nov 2015 21:41:29 +0000 (16:41 -0500)]
Vibrate when the gear gets up to speed
Bug:
25198361
Change-Id: I2a87c2b5594cef39b247de9ae524664c60e2a0ee
George Mount [Wed, 11 Nov 2015 15:33:00 +0000 (15:33 +0000)]
Merge "Improve DatePicker focus for keyboards."
George Mount [Wed, 11 Nov 2015 15:32:20 +0000 (15:32 +0000)]
Merge "Have focus avoid middle of a foucs chain when possible."
Andrei Stingaceanu [Tue, 10 Nov 2015 13:03:31 +0000 (13:03 +0000)]
Introduce APIs in DPM for setting/getting the device owner info
This information, if set, will be shown in the lock screen instead
of the user owner information and the settings tile will be made readonly
(implementation in following CLs).
Bug:
22547309
Change-Id: Ic826d8049bc67f5e8fcfa6a91aa2017247c93b11
Geoff Mendal [Wed, 11 Nov 2015 13:42:06 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 11 Nov 2015 13:38:05 +0000 (05:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id20219220ba0cace66145a7f51c64ba6e3157f86
Auto-generated-cl: translation import