Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
259,063 Commits 3 Branches 0 Tags
4e3455aebf68be65f64ec888a59c07ed3bb7d69a
Commit Graph

66088 Commits

Author SHA1 Message Date
Julia Reynolds
4e3455aebf Merge "Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad am: b15ecad14c" into nyc-mr1-dev-plus-aosp 
am: f5b62afe86

* commit 'f5b62afe86c0118260f5ee82890c12868dcbd90f':
  Do not bundle cross user.

Change-Id: If5163d7bf39f0a086b6b66f39115c366d053d618
 2016-05-11 17:32:57 +00:00
Julia Reynolds
35410a4128 Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad 
am: b15ecad14c

* commit 'b15ecad14c8eb9fbf00ffb82c6d5dea37dabcc80':
  Do not bundle cross user.

Change-Id: I54f3d8b36617f5a9294d119a76b19cba0b9793b2
 2016-05-11 17:29:42 +00:00
Julia Reynolds
b15ecad14c Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: Ifa9198643939c69493a0ae406f48437d3bf94bd7
 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
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
Clara Bayarri
9b4ccde88d Fix crash in ResolverActivity 
am: 9550f5dfa6

* commit '9550f5dfa607b1c464c2673186ee26e4b12a79d6':
  Fix crash in ResolverActivity

Change-Id: I57b593f67937556ea6268be0a43bcd8fe6da6e68
 2016-05-11 15:08:05 +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
Clara Bayarri
21d1a441ad Merge "Fix crash in ResolverActivity" 2016-05-11 14:55:38 +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
9580593e5d Merge "Fix secondary ABI instrumetion" into nyc-dev 
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I0ad719338b8cbcf9cf90526d2e0196aa25ff07ad
 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
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
5662120923 Merge "GradientColor: Fix typo in documentation." into nyc-dev 
am: a452dd3fd9

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

Change-Id: I647222141e85163cefe2241a96439f0eb3d7a97a
 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
Clara Bayarri
b53b2bd088 Fix crash in ResolverActivity 
Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
 2016-05-11 11:20:13 +01:00
Jeff Sharkey
f506350414 Merge "Fail upgrades that change storage devices." into nyc-dev am: 1fdeb5bdf7 am: bd92d3c267 
am: d7fe2a02be

* commit 'd7fe2a02be5fd9b280d4612e8042a6994bf90013':
  Fail upgrades that change storage devices.

Change-Id: Ia2fa24453a913d6cf9bca5fcd639973b67325ef9
 2016-05-11 01:12:59 +00:00
Jeff Sharkey
d7fe2a02be Merge "Fail upgrades that change storage devices." into nyc-dev am: 1fdeb5bdf7 
am: bd92d3c267

* commit 'bd92d3c26722e4a435e1c46364cddb27a222df7d':
  Fail upgrades that change storage devices.

Change-Id: Id9e9becd2a18bdeff760fd1b940465388f906d1c
 2016-05-11 01:10:07 +00:00
Jeff Sharkey
ae32884c48 Merge "Fail upgrades that change storage devices." into nyc-dev 
am: 1fdeb5bdf7

* commit '1fdeb5bdf7530eef212b414860569202eb5a68fa':
  Fail upgrades that change storage devices.

Change-Id: I8f0a6ee997552743ee26a965e91809a737e6f0ff
 2016-05-11 01:07:23 +00:00
Jeff Sharkey
bd92d3c267 Merge "Fail upgrades that change storage devices." into nyc-dev 
am: 1fdeb5bdf7

* commit '1fdeb5bdf7530eef212b414860569202eb5a68fa':
  Fail upgrades that change storage devices.

Change-Id: I88868123f5122c039a9aea19b6fdd9ecae089972
 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
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
ff72d0c500 Don\'t stage content drawn bounds 
am: e85ce990fe

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

Change-Id: Iac78a8adfdce673a7294ffa4b746f0beb5fa5876
 2016-05-11 00:43:58 +00:00
Fyodor Kupolov
5a3477d52e Merge "Push unlocking/unlocked state to UserManager" into nyc-dev 
am: fdc675968c

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

Change-Id: Ice3c4078d4deb85dd1b1eee2924be19f28fb6a85
 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
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
Clara Bayarri
b44ddbb5b3 Merge "Add Tron logging for open/close App Disambig" into nyc-mr1-dev 
am: f4f15d582a

* commit 'f4f15d582a60b9324e4b1e4f3276f4cc4b2b0531':
  Add Tron logging for open/close App Disambig

Change-Id: I77ba68bc54cfa0a6b382adce4f1605196a07aab4
 2016-05-10 23:53:13 +00: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
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
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
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