Tingting Wang
7531057944
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
...
am: 752129929f
2016-05-12 17:24:20 +00:00
Tingting Wang
752129929f
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
2016-05-12 17:11:44 +00:00
Makoto Onuki
26edcba2c9
Merge "Remove ShortcutManager" into nyc-dev
2016-05-12 16:32:56 +00:00
Alan Viverette
941bbd4eb7
Merge "Remove extra logging in DatePicker" into nyc-dev
...
am: c952b035b2
2016-05-12 15:02:36 +00:00
Alan Viverette
c952b035b2
Merge "Remove extra logging in DatePicker" into nyc-dev
2016-05-12 14:57:58 +00:00
Chris Wren
d328afff96
Merge "document the return type of getImportance" into nyc-dev
...
am: 3041d49d88
2016-05-12 13:00:45 +00:00
Chris Wren
3041d49d88
Merge "document the return type of getImportance" into nyc-dev
2016-05-12 12:53:51 +00:00
Jorim Jaggi
1e35919a09
Merge "Fix smallest width configuration calculation" into nyc-dev
...
am: 63c09fd6cd
2016-05-12 01:55:13 +00:00
Jorim Jaggi
63c09fd6cd
Merge "Fix smallest width configuration calculation" into nyc-dev
2016-05-12 01:50:05 +00:00
Jorim Jaggi
8563943bd3
Fix smallest width configuration calculation
...
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.
In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.
Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes: 28469673
2016-05-11 18:33:01 -07:00
Adam Lesinski
ebfb372876
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
...
am: 3723194dc8
2016-05-12 01:11:18 +00:00
Adam Lesinski
3723194dc8
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
2016-05-12 00:59:29 +00:00
Dianne Hackborn
9f073e94e0
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
...
am: b3edcd78d2#28400000 : Settings memory UI still showing z-ram...
Change-Id: Iabd4b29208f3a26e78d4773033a7653738dc471d
2016-05-12 00:50:34 +00:00
Dianne Hackborn
b3edcd78d2
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
2016-05-12 00:40:18 +00:00
Aurimas Liutikas
462c3ba3ef
Merge "Stop saving ActionMenuItemView state." into nyc-dev
...
am: b9bb8e88c6
2016-05-12 00:38:53 +00:00
Jim Miller
ca299c6fbd
Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
...
am: 254d9e4f41
2016-05-12 00:38:38 +00:00
TreeHugger Robot
b9bb8e88c6
Merge "Stop saving ActionMenuItemView state." into nyc-dev
2016-05-11 23:54:41 +00:00
Jim Miller
254d9e4f41
Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
2016-05-11 23:45:09 +00:00
Yigit Boyar
8e03a859cc
Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
...
am: 1a97cbd4ca
2016-05-11 22:42:09 +00:00
Yigit Boyar
1a97cbd4ca
Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
...
* changes:
Fully detach unused scrap views
Remove detached headers
2016-05-11 22:32:05 +00:00
Aurimas Liutikas
9c661a40c1
Stop saving ActionMenuItemView state.
...
There is no useful state to be saved for these views.
This fixes a crash where we try to restore the state of an
ActionView (that shares the same ID as ActionMenuItemView).
Framework version of ag/1020805
Bug: 28110832
Change-Id: I4a09786a1c08bef1765fd8be3affb21dce296272
2016-05-11 14:46:47 -07:00
Adam Powell
8dd12a52cc
Merge "Less lazy child FragmentManager creation" into nyc-dev
...
am: 6437dac3d9
2016-05-11 21:41:43 +00:00
Adam Powell
6437dac3d9
Merge "Less lazy child FragmentManager creation" into nyc-dev
2016-05-11 21:32:57 +00:00
Makoto Onuki
538c440c33
Remove ShortcutManager
...
Bug 28704708
Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
2016-05-11 14:25:55 -07:00
Dianne Hackborn
ef0a402f58
Fix issue #28400000 : Settings memory UI still showing z-ram...
...
...but probably shouldn't.
Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.
Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a
2016-05-11 14:21:07 -07:00
Alan Viverette
efb8e576a9
Remove extra logging in DatePicker
...
Issue seems to be fixed now, don't need the extra logging.
Bug: 27310206
Change-Id: Ibf53d056e9c5144729dae02c72050aebd90e4343
2016-05-11 17:10:13 -04:00
Adam Powell
467cc6f0e1
Less lazy child FragmentManager creation
...
Framework edition
Fix a bug where child FragmentManagers moving too lazily into the
CREATED state and beyond caused child fragments to not be
attached/created when expected.
Bug 25019275
Change-Id: I04ff0d3bcb693178a6ee3057da591392defdbcf8
2016-05-11 13:45:33 -07:00
Julia Reynolds
47e0d29473
Merge "Do not bundle cross user." into nyc-dev
...
am: 68a32b5aad
2016-05-11 17:26:59 +00:00
Julia Reynolds
68a32b5aad
Merge "Do not bundle cross user." into nyc-dev
2016-05-11 17:20:16 +00:00
Robert Carr
965c343065
Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev
...
am: a625b0b597
2016-05-11 16:48:28 +00:00
Chris Wren
5ab5c748a8
document the return type of getImportance
...
Bug: 28690726
Change-Id: I06508e9e7c38e26e84801b86d6974f01abf5dfc1
2016-05-11 12:44:58 -04:00
Rob Carr
a625b0b597
Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev
2016-05-11 16:44:16 +00:00
Julia Reynolds
eae43fbd17
Do not bundle cross user.
...
Bug: 28665081
Change-Id: I026b8a3a731183f96b45c19b95b4a0d109677a4c
2016-05-11 10:59:53 -04:00
Clara Bayarri
9550f5dfa6
Fix crash in ResolverActivity
...
Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
(cherry picked from commit b53b2bd088
2016-05-11 14:57:37 +00:00
Todd Kennedy
9580593e5d
Merge "Fix secondary ABI instrumetion" into nyc-dev
...
am: f09f069936
2016-05-11 14:41:41 +00:00
Todd Kennedy
f09f069936
Merge "Fix secondary ABI instrumetion" into nyc-dev
2016-05-11 14:35:19 +00:00
Greg Kaiser
5662120923
Merge "GradientColor: Fix typo in documentation." into nyc-dev
...
am: a452dd3fd9
2016-05-11 12:39:34 +00:00
Greg Kaiser
a452dd3fd9
Merge "GradientColor: Fix typo in documentation." into nyc-dev
2016-05-11 12:32:18 +00:00
Jim Miller
e4044bb617
Fix KeyguardManager.isSecure() to observe work profile
...
The fix passes the calling userId instead of the current userId to
allow apps running as managed profiles to work.
Fixes bug 28666104
Change-Id: I9f8676ab11bd581d9e67b2b9f385036d4d3576ee
2016-05-10 18:38:25 -07:00
Jeff Sharkey
bd92d3c267
Merge "Fail upgrades that change storage devices." into nyc-dev
...
am: 1fdeb5bdf7
2016-05-11 01:07:22 +00:00
TreeHugger Robot
1fdeb5bdf7
Merge "Fail upgrades that change storage devices." into nyc-dev
2016-05-11 01:02:32 +00:00
Jorim Jaggi
ff72d0c500
Don\'t stage content drawn bounds
...
am: e85ce990fe
2016-05-11 00:43:58 +00:00
Fyodor Kupolov
5a3477d52e
Merge "Push unlocking/unlocked state to UserManager" into nyc-dev
...
am: fdc675968c
2016-05-11 00:43:57 +00:00
Jorim Jaggi
e85ce990fe
Don't stage content drawn bounds
...
It's certainly not needed for two up, so remove the staging aspect.
Freeform resizing is currently broken because of another bug so this
can't be tested, but because we are not "shipping" it in any case
fixing the 2-up bug is more important, but it shouldn't break freeform
anyways.
Bug: 28618501
Change-Id: I6f285a714281fde50fd7328a3f8999cfa8dfb2c5
2016-05-11 00:37:33 +00:00
Tingting Wang
e0cbda454c
Rename CONTACT_METADATA_SYNC GService Flag.
...
Rename it to CONTACT_METADATA_SYNC_ENABLED.
BUG 28295805
Change-Id: Ib1f735b082a2ff6cca93e377b3eaaaf7cd396b8d
2016-05-10 17:29:00 -07:00
Fyodor Kupolov
fdc675968c
Merge "Push unlocking/unlocked state to UserManager" into nyc-dev
2016-05-11 00:27:48 +00:00
Greg Kaiser
2d609eda74
GradientColor: Fix typo in documentation.
...
Bug: 28678266
Change-Id: I8f551108643698a1b6c573911509a4e48ad88783
2016-05-10 17:05:31 -07:00
TreeHugger Robot
f4f15d582a
Merge "Add Tron logging for open/close App Disambig" into nyc-mr1-dev
2016-05-10 23:49:25 +00:00
Makoto Onuki
4a3b597f55
Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev
2016-05-10 23:02:49 +00:00
Jeff Sharkey
2d3709246e
Fail upgrades that change storage devices.
...
Now that we live in an FBE world, we need the user to be involved
with every package move to ensure that CE storage is unlocked. This
means that a package upgrade session that would require moving an
app between storage devices cannot be satisfied.
Bug: 27147501
Change-Id: I274d85cbed727d9185178b77bfc6cef196df17f5
2016-05-10 17:01:51 -06:00
