Commit Graph

60228 Commits

Author SHA1 Message Date
Robert Carr
73c227d1de Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev am: a625b0b597 am: e49ecf58e9
am: e23f0f9f0f

* commit 'e23f0f9f0fefc06efcfcd5e44decdd7384496c05':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: I14da04a61d5db39379712ccb83023e103b09e4bf
2016-05-11 16:54:18 +00:00
Rob Carr
e23f0f9f0f Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev am: a625b0b597
am: e49ecf58e9

* commit 'e49ecf58e9d95c3a5cf63654b6d507c141b66982':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: I33333147a03cf53d2a3f7768b6246c5bdc3b1dc0
2016-05-11 16:51:16 +00:00
Robert Carr
e49ecf58e9 Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev
am: a625b0b597

* commit 'a625b0b5976c17d8efabcf348613db7fda3e56cf':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: I84b8882069a36c8f625060cb82696660a0c9c681
2016-05-11 16:48:32 +00: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
Todd Kennedy
728fe71b21 Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936 am: fc7701c569
am: d2ebc5e3ab

* commit 'd2ebc5e3ab900905b4b14de55e4be9d0e70c51d6':
  Fix secondary ABI instrumetion

Change-Id: Ieceae5d3fe442bbd0c6821ead5dc37dc2ee83a71
2016-05-11 14:47:09 +00:00
Todd Kennedy
d2ebc5e3ab Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936
am: fc7701c569

* commit 'fc7701c56923369bb30eae6559dfbc100a174477':
  Fix secondary ABI instrumetion

Change-Id: I88afbda2d0b4f87f03b9806ff6de9a4066bd4dac
2016-05-11 14:44:34 +00:00
Todd Kennedy
fc7701c569 Merge "Fix secondary ABI instrumetion" into nyc-dev
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I7a48511c8038725524abd8fc0adbd86e9e9fe09c
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
b482032705 Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9 am: 9311165c2c
am: bac3e57f3d

* commit 'bac3e57f3d5e1d4b1ec0b184d4bbc9657f7d0f13':
  GradientColor: Fix typo in documentation.

Change-Id: I91779eec11c9966c9f1ea8e6566c96a301c50f6d
2016-05-11 12:45:21 +00:00
Greg Kaiser
bac3e57f3d Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9
am: 9311165c2c

* commit '9311165c2cbb42fe37a42dc916e303ac180f9f6c':
  GradientColor: Fix typo in documentation.

Change-Id: I590125c62d1e5b73bfe3b0255f69c07daf3d78b9
2016-05-11 12:42:17 +00:00
Greg Kaiser
9311165c2c Merge "GradientColor: Fix typo in documentation." into nyc-dev
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I392ac824d733dcbeb2e79d5be4ad1668ad3400cc
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
Jorim Jaggi
cf0ed4b464 Don\'t stage content drawn bounds am: e85ce990fe am: a229226c61
am: 4b4a8323c1

* commit '4b4a8323c13913b75901f855c45de946e58015d6':
  Don't stage content drawn bounds

Change-Id: I129b56f30236db074e3884900a6ae6a619ad62a0
2016-05-11 00:49:46 +00:00
Fyodor Kupolov
282e241b11 Merge "Push unlocking/unlocked state to UserManager" into nyc-dev am: fdc675968c am: 6b366a34ee
am: 5a8fb5004c

* commit '5a8fb5004ce396716660ca115e1d583c869570b7':
  Push unlocking/unlocked state to UserManager

Change-Id: I9796ecc6ded494c9ad8dd8a10600f6eae593ce01
2016-05-11 00:49:42 +00:00
Jorim Jaggi
4b4a8323c1 Don\'t stage content drawn bounds am: e85ce990fe
am: a229226c61

* commit 'a229226c61580f6d70768f3d7dc51c3fb6f00764':
  Don't stage content drawn bounds

Change-Id: If988837b1c743a0f4ec8996bd79c679a973024f6
2016-05-11 00:47:14 +00:00
Fyodor Kupolov
5a8fb5004c Merge "Push unlocking/unlocked state to UserManager" into nyc-dev am: fdc675968c
am: 6b366a34ee

* commit '6b366a34eeda68e63ce00621d4ce133786320860':
  Push unlocking/unlocked state to UserManager

Change-Id: I8aadfc85b24159c701fd82ab7d0d403a7def4545
2016-05-11 00:47:12 +00:00
Jorim Jaggi
a229226c61 Don\'t stage content drawn bounds
am: e85ce990fe

* commit 'e85ce990fe7bfa33d6b7d8bfd23b7336096466b9':
  Don't stage content drawn bounds

Change-Id: I2e380e1fb43f26b90927c10e2b445049e2fd2966
2016-05-11 00:44:02 +00:00
Fyodor Kupolov
6b366a34ee Merge "Push unlocking/unlocked state to UserManager" into nyc-dev
am: fdc675968c

* commit 'fdc675968c818a1913b870dd16077f6fe785ee3f':
  Push unlocking/unlocked state to UserManager

Change-Id: I687b30f32925009b8060ea07d78263672f580e08
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
Ben Lin
ba92ba5cc3 Merge "Add support for search in DownloadManager." 2016-05-10 23:32:03 +00:00
Makoto Onuki
7608f5d214 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev am: 4a3b597f55
am: c9289b8053

* commit 'c9289b805307ff071ad2b17936bfb4b4a6f4ad84':
  Refactoring ShortcutManager + bug fixes.

Change-Id: I9b584cd3ff0125294556fc3ca56cc01895167367
2016-05-10 23:09:26 +00:00
Makoto Onuki
c9289b8053 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev
am: 4a3b597f55

* commit '4a3b597f557ef900299202ef88a6e601c0629368':
  Refactoring ShortcutManager + bug fixes.

Change-Id: Ief3a0dd2c81a2343895a88d9049b48d19bac6ac1
2016-05-10 23:07:02 +00:00
Makoto Onuki
4a3b597f55 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev 2016-05-10 23:02:49 +00:00
Amith Yamasani
d99b6fde12 Merge "Fix multi-window assiststructure trashing" into nyc-dev am: a66d395490 am: 0ce0116338
am: 9165f15e7d

* commit '9165f15e7d171db6d8c91be84e6bacd99d672e6f':
  Fix multi-window assiststructure trashing

Change-Id: I6a323c1c75a8ff9fe9f891ee1ecb6b0f25e1b034
2016-05-10 22:38:06 +00:00
Amith Yamasani
9165f15e7d Merge "Fix multi-window assiststructure trashing" into nyc-dev am: a66d395490
am: 0ce0116338

* commit '0ce011633880e90a314cfc286519b89dac66d482':
  Fix multi-window assiststructure trashing

Change-Id: Id1a7b8a2209fc1b62b2814a6fac0b3dacd5c552d
2016-05-10 22:35:31 +00:00
Amith Yamasani
0ce0116338 Merge "Fix multi-window assiststructure trashing" into nyc-dev
am: a66d395490

* commit 'a66d395490fc0797fb7b24ad8148c510a6e2cff3':
  Fix multi-window assiststructure trashing

Change-Id: I8bf4366b8e5bf7b0c37a9f81e2d0303b8dfdd22d
2016-05-10 22:32:53 +00:00
Amith Yamasani
aba30bf7dd Merge "Fix multi-window assiststructure trashing" into nyc-dev
am: a66d395490

* commit 'a66d395490fc0797fb7b24ad8148c510a6e2cff3':
  Fix multi-window assiststructure trashing

Change-Id: Ief57ac26261e2248441acd3138b63e4b6272fc4a
2016-05-10 22:32:51 +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
9db9897215 Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev am: 56e2aeba8f am: 6e90b67dfa
am: 82e644de2f

* commit '82e644de2f1db76e20e676086b580e224d5d9d5b':
  Move Activity multi-window event logic out of the public methods

Change-Id: I2d7e79c29cbcad62727ed701c1e7d0519deca24e
2016-05-10 21:46:07 +00:00
Chong Zhang
9c6ba9c340 Disable keep_screen_on traces am: 44aabe4b72 am: 3cb9edff41
am: eb80f34310

* commit 'eb80f3431033ddbd7f5b1d5f1c60b71c5d656cf8':
  Disable keep_screen_on traces

Change-Id: I182b433eab8603802705aa876eff2293ba925832
2016-05-10 21:45:58 +00:00
Winson
0c146dacff Merge "Reducing the number of recent tasks we keep." into nyc-dev am: 9e935820b5 am: 9fc0a7c4c4
am: c4b7595962

* commit 'c4b7595962d217d07596469b378831630dd61d72':
  Reducing the number of recent tasks we keep.

Change-Id: If80c8f44ebee97ff30cc858ea9edf6ec99909e3b
2016-05-10 21:45:47 +00:00
Ben Lin
ce763d8bac Add support for search in DownloadManager.
Bug: 26524617
Change-Id: I41c0f92381bec8ad06db73b25ec67466f368b55c
2016-05-10 21:45:25 +00:00
Adam Powell
82e644de2f Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev am: 56e2aeba8f
am: 6e90b67dfa

* commit '6e90b67dfaf02c236b542951dfaac3a7d805ef21':
  Move Activity multi-window event logic out of the public methods

Change-Id: I1eb6677d8ecd2208b20c2094eb4d708f6e20bc14
2016-05-10 21:40:16 +00:00
Chong Zhang
eb80f34310 Disable keep_screen_on traces am: 44aabe4b72
am: 3cb9edff41

* commit '3cb9edff41317a9b3627032918cf9cfc54f0eb88':
  Disable keep_screen_on traces

Change-Id: I57e74c20bfb4339dcac52ee85a89899b89ca237d
2016-05-10 21:40:11 +00:00
Winson Chung
c4b7595962 Merge "Reducing the number of recent tasks we keep." into nyc-dev am: 9e935820b5
am: 9fc0a7c4c4

* commit '9fc0a7c4c4e8eeddc6b4a74267731b26e87a20f5':
  Reducing the number of recent tasks we keep.

Change-Id: I184a3a28a3365c897f108f93947168f228c1c235
2016-05-10 21:40:07 +00:00
Adam Powell
d8cc73d92b Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev
am: 56e2aeba8f

* commit '56e2aeba8fb40190dbe1303ae1d299e77e764b44':
  Move Activity multi-window event logic out of the public methods

Change-Id: I74706461487dde9e4f3ff3ff62be4e5778190c52
2016-05-10 21:37:05 +00:00
Chong Zhang
7722999ebd Disable keep_screen_on traces
am: 44aabe4b72

* commit '44aabe4b7240a9a03678b4a66bdd5f46a9dfb29a':
  Disable keep_screen_on traces

Change-Id: Icc19da42ecec4231fe323b3bb9d728ef02812918
2016-05-10 21:37:02 +00:00
Adam Powell
6e90b67dfa Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev
am: 56e2aeba8f

* commit '56e2aeba8fb40190dbe1303ae1d299e77e764b44':
  Move Activity multi-window event logic out of the public methods

Change-Id: I7c774d19ff87c52594642f1e5f277f26a2a28b39
2016-05-10 21:36:59 +00:00
Winson
4f4152a9e2 Merge "Reducing the number of recent tasks we keep." into nyc-dev
am: 9e935820b5

* commit '9e935820b5d0134d71fc5ae51001b276ab603c51':
  Reducing the number of recent tasks we keep.

Change-Id: If44266c1872505f90cb8ae60c6a8fbdbca495d6e
2016-05-10 21:36:58 +00:00
Chong Zhang
3cb9edff41 Disable keep_screen_on traces
am: 44aabe4b72

* commit '44aabe4b7240a9a03678b4a66bdd5f46a9dfb29a':
  Disable keep_screen_on traces

Change-Id: Ifd5701bf93ab70b55ddd4c08e958561edfb85e78
2016-05-10 21:36:56 +00:00
Winson
9fc0a7c4c4 Merge "Reducing the number of recent tasks we keep." into nyc-dev
am: 9e935820b5

* commit '9e935820b5d0134d71fc5ae51001b276ab603c51':
  Reducing the number of recent tasks we keep.

Change-Id: I8f1eab7444272080f151521d5ceab2c185fb828c
2016-05-10 21:36:53 +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
039270192c Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev am: f2cbf95b6b am: 99ac8cb861
am: e6ed9c619a

* commit 'e6ed9c619a9bfe80b197deb29f9555f5be23c572':
  Sum up character widths to get the last line width for ellipsis.

Change-Id: I2dc639006dfd95a4d8d5429f0c54841bc28a651b
2016-05-10 21:31:19 +00:00
Makoto Onuki
c51b2876ec Refactoring ShortcutManager + bug fixes.
- Don't pass the ShortcutService instance as an argument.  This tiny
optimization is no longer meaningful now that PackageShortcut and
PackageLauncher have reference to ShortcutUser.

- Rename mLauncherComponent to mDefaultLauncherComponent for clarity.

- Don't instantiate ShortcutPackage instances when not needed.

- Don't allow intents with a null action.

- Also improve javadoc.

Bug 28592642
Bug 28474517
Bug 28557169

Change-Id: I8790d3494bf3b92c143c02824b0ed0e514504baa
2016-05-10 14:28:31 -07:00
Keisuke Kuroyanagi
e6ed9c619a Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev am: f2cbf95b6b
am: 99ac8cb861

* commit '99ac8cb8614b5bd4819d7d9599f581a1c3d890f3':
  Sum up character widths to get the last line width for ellipsis.

Change-Id: I417c0962211b858989fabb9d0d09fe536aaae97c
2016-05-10 21:28:12 +00:00