Makoto Onuki
82c64a485a
Merge "Remove ShortcutManager" into nyc-dev
...
am: 26edcba2c9
2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9
Merge "Remove ShortcutManager" into nyc-dev
2016-05-12 16:32:56 +00:00
Alan Viverette
a6c89dd6a0
Merge "Remove extra logging in DatePicker" into nyc-dev
...
am: c952b035b2
2016-05-12 15:02:39 +00:00
Alan Viverette
c952b035b2
Merge "Remove extra logging in DatePicker" into nyc-dev
2016-05-12 14:57:58 +00:00
Chris Wren
08eb83f8b0
Merge "document the return type of getImportance" into nyc-dev
...
am: 3041d49d88
2016-05-12 13:00:50 +00:00
Chris Wren
3041d49d88
Merge "document the return type of getImportance" into nyc-dev
2016-05-12 12:53:51 +00:00
Adam Lesinski
04d676b3ae
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
...
am: 3723194dc8
2016-05-12 01:11:21 +00:00
Adam Lesinski
3723194dc8
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
2016-05-12 00:59:29 +00:00
Dianne Hackborn
fc101121f2
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: I1eda5e59bdd122dd35a8025b35b63b216ca9e60d
2016-05-12 00:50:42 +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
Jim Miller
3c1e640d83
Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
...
am: 254d9e4f41
2016-05-12 00:39:02 +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
c8777a833a
Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
...
am: 1a97cbd4ca
2016-05-11 22:42:06 +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
Adam Powell
3b981d026c
Merge "Less lazy child FragmentManager creation" into nyc-dev
...
am: 6437dac3d9
2016-05-11 21:41:50 +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
b15ecad14c
Merge "Do not bundle cross user." into nyc-dev
...
am: 68a32b5aad
2016-05-11 17:27:03 +00:00
Julia Reynolds
68a32b5aad
Merge "Do not bundle cross user." into nyc-dev
2016-05-11 17:20:16 +00:00
Robert Carr
e49ecf58e9
Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev
...
am: a625b0b597
2016-05-11 16:48:32 +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
Todd Kennedy
fc7701c569
Merge "Fix secondary ABI instrumetion" into nyc-dev
...
am: f09f069936
2016-05-11 14:41:44 +00:00
Todd Kennedy
f09f069936
Merge "Fix secondary ABI instrumetion" into nyc-dev
2016-05-11 14:35:19 +00:00
Greg Kaiser
9311165c2c
Merge "GradientColor: Fix typo in documentation." into nyc-dev
...
am: a452dd3fd9
2016-05-11 12:39:38 +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
Jorim Jaggi
a229226c61
Don\'t stage content drawn bounds
...
am: e85ce990fe
2016-05-11 00:44:02 +00:00
Fyodor Kupolov
6b366a34ee
Merge "Push unlocking/unlocked state to UserManager" into nyc-dev
...
am: fdc675968c
2016-05-11 00:43:59 +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
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
Amith Yamasani
0ce0116338
Merge "Fix multi-window assiststructure trashing" into nyc-dev
...
am: a66d395490
2016-05-10 22:32:53 +00:00
Amith Yamasani
a66d395490
Merge "Fix multi-window assiststructure trashing" into nyc-dev
2016-05-10 22:29:20 +00:00
Todd Kennedy
e713efcac1
Fix secondary ABI instrumetion
...
When installing an APK that supports multiple ABIs, the ABI installed
can be forced to the secondary ABI [i.e. On devices that support both
32 and 64 bit variants, the 32-bit version can be forced when it's
the secondary ABI.] In this case, instrumenting the class always tried
to use the primary ABI. Instead of blindly using the primary ABI and
dropping the secondary ABI, we propagate both ABIs and make a
decision on which one should be chosen.
Bug: 28406240
Change-Id: I7ebb2fd264d2281912afd30f6d73ccb460f9cf85
2016-05-10 15:16:13 -07:00
Adam Powell
d8cc73d92b
Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev
...
am: 56e2aeba8f
2016-05-10 21:37:05 +00:00
Chong Zhang
7722999ebd
Disable keep_screen_on traces
...
am: 44aabe4b72
2016-05-10 21:37:02 +00:00
Winson
4f4152a9e2
Merge "Reducing the number of recent tasks we keep." into nyc-dev
...
am: 9e935820b5
2016-05-10 21:36:58 +00:00
Adam Powell
56e2aeba8f
Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev
2016-05-10 21:34:29 +00:00
Chong Zhang
44aabe4b72
Disable keep_screen_on traces
...
bug: 28692100
bug: 27522448
Change-Id: Ic077e8985f1f21bc111287813fb2992ed01df909
2016-05-10 21:34:01 +00:00
Winson Chung
9e935820b5
Merge "Reducing the number of recent tasks we keep." into nyc-dev
2016-05-10 21:33:33 +00:00
Keisuke Kuroyanagi
99ac8cb861
Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev
...
am: f2cbf95b6b
2016-05-10 21:25:17 +00:00
Keisuke Kuroyanagi
f2cbf95b6b
Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev
2016-05-10 21:16:02 +00:00
Paul Crowley
05190e3bbf
Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
...
am: f829c1463b
2016-05-10 21:13:55 +00:00
Paul Crowley
f829c1463b
Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
2016-05-10 21:07:59 +00:00
Antonio Cansado
7598ac2aa7
Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev
...
am: dc5f558640
2016-05-10 21:05:17 +00:00
