Commit Graph

60202 Commits

Author SHA1 Message Date
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
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
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
Keisuke Kuroyanagi
99ac8cb861 Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev
am: f2cbf95b6b

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

Change-Id: Iaa3cab4dfb904c0291e703eca9125aef0ef50f70
2016-05-10 21:25:17 +00:00
Keisuke Kuroyanagi
61e162e0e9 Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev
am: f2cbf95b6b

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

Change-Id: I28193273103bf68fbd778048540c35dbf9a51170
2016-05-10 21:25:13 +00:00
Paul Crowley
fc5b696d65 Merge "Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev am: f829c1463b am: 05190e3bbf" into nyc-mr1-dev-plus-aosp
am: b9984f2c2d

* commit 'b9984f2c2d42552c886dea220c42ad9e18447d8a':
  Revert "Two phases to set the password for disk encryption"

Change-Id: Ia194f94777f6ca499d9e044a91f83a8ad99cd325
2016-05-10 21:20:11 +00:00
Paul Crowley
f75a03dd30 Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev am: f829c1463b
am: 05190e3bbf

* commit '05190e3bbf43cc95abf7bf103644d121317a3a00':
  Revert "Two phases to set the password for disk encryption"

Change-Id: I59cccbbef2c5af884ac83546f075d1dea95f6b23
2016-05-10 21:17:03 +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
Antonio Cansado
f8be7f2a5d Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 am: 7598ac2aa7
am: 8b2dd44f2f

* commit '8b2dd44f2f30a9dd22799ee30dd4b9c5a093aae5':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ie6455799758f0bdb67440f72c266effaf412e22f
2016-05-10 21:14:09 +00:00
Paul Crowley
05190e3bbf Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
am: f829c1463b

* commit 'f829c1463b4805545d15924ad6243b9405eb83d6':
  Revert "Two phases to set the password for disk encryption"

Change-Id: Ic57b08d344020d9705a4bc2208b4adabebbe9151
2016-05-10 21:13:55 +00:00
Paul Crowley
dd05d2d150 Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
am: f829c1463b

* commit 'f829c1463b4805545d15924ad6243b9405eb83d6':
  Revert "Two phases to set the password for disk encryption"

Change-Id: Ia2d8b2e751a42771cfa5fedbf47b73be6491820c
2016-05-10 21:13:51 +00:00
Antonio Cansado
8b2dd44f2f Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640
am: 7598ac2aa7

* commit '7598ac2aa79f328e52e58bdaa2d8e8d858c2c463':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ia886e1ce98520c1618ba501097a2c979a628bbb4
2016-05-10 21:08:25 +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

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I952e69e7cfbd8cebcbac7c3b19ede300e26777e8
2016-05-10 21:05:17 +00:00
Antonio Cansado
de224ba451 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I9d884ed999b507ab172418f068c10483422643d3
2016-05-10 21:05:16 +00:00
Winson
7c40291b0a Reducing the number of recent tasks we keep.
- This should decrease the time it takes to fetch the recent task list,
  and also reduce the number of tasks we store on-disk.
- Since a user can still open a fair number of tasks within the 
  time-window, and this list includes tasks that are excluded from the 
  UI, we are just reducing it to about half for the time being.

Bug: 28318359
Change-Id: Ie21b3d3d09a567007015fbbecaf914123c71cc06
2016-05-10 21:01:33 +00:00
Paul Crowley
a1eb750e75 Revert "Two phases to set the password for disk encryption"
This reverts commit 17e5dce511.

Bug: 28694324
Change-Id: I6d89bc26cb429b195c9bcf640666c495617257b7
2016-05-10 20:36:56 +00:00
Phil Weaver
b243a9d422 Merge "Reduce cost of a11y services with magnification." into nyc-dev am: cdaaaaad90 am: 905c159749
am: ae6d46419d

* commit 'ae6d46419d3d493f490098c9c6281fe7ea253093':
  Reduce cost of a11y services with magnification.

Change-Id: I390b96cef5a447a897fd4b807ad5843788e1ad51
2016-05-10 20:30:41 +00:00
Phil Weaver
ae6d46419d Merge "Reduce cost of a11y services with magnification." into nyc-dev am: cdaaaaad90
am: 905c159749

* commit '905c1597492f607fda5a34ea0b3610ca4e793a67':
  Reduce cost of a11y services with magnification.

Change-Id: I07454b1ea47f99893dfa590f27b48793f1fea435
2016-05-10 20:28:09 +00:00
Phil Weaver
905c159749 Merge "Reduce cost of a11y services with magnification." into nyc-dev
am: cdaaaaad90

* commit 'cdaaaaad905396e4f0f2ebd9b37240095182d1d7':
  Reduce cost of a11y services with magnification.

Change-Id: Ib93769bbbce508d0eae77cd830d361e5e686de47
2016-05-10 20:25:31 +00:00
Phil Weaver
cb09c126d8 Merge "Reduce cost of a11y services with magnification." into nyc-dev
am: cdaaaaad90

* commit 'cdaaaaad905396e4f0f2ebd9b37240095182d1d7':
  Reduce cost of a11y services with magnification.

Change-Id: I1eb037c3094d99fcf648fcdd0d15edf78346f7fa
2016-05-10 20:25:28 +00:00
Antonio Cansado
6965c1869a Addressing API council comments on NetworkStatsManager.
Callbacks
 - DataUsageCallback renamed to UsageCallback
 - DataUsagePolicy removed; passing in params directly to register method
 - making it an abstract class
 - passing in (networkType, subscriberId) that reached its threshold
 - renaming onLimitReached to onThresholdReached to match existing naming
 - only monitor single network,subscriberId
 - no monitoring of specific uids; using device or user wide instead

Tags
 - only owner uid can read its tags
 - exposing only TAG_NONE to match service side

BUG: 27530098

Change-Id: I2b2664da71806868a1e937d2bf4d1f234637509b
2016-05-10 13:24:16 -07:00
Phil Weaver
cdaaaaad90 Merge "Reduce cost of a11y services with magnification." into nyc-dev 2016-05-10 20:18:12 +00:00
Andreas Gampe
452426b25f Merge "Frameworks/base: Shorten system property" into nyc-dev am: a8f51e3e46 am: ddaeb30d5b
am: 962906b6b7

* commit '962906b6b778f098e08cddbdffd81cc740f098ba':
  Frameworks/base: Shorten system property

Change-Id: Ieb6d2d33973f7150c0424fabac48573c18bb2dc3
2016-05-10 20:08:15 +00:00
Andreas Gampe
962906b6b7 Merge "Frameworks/base: Shorten system property" into nyc-dev am: a8f51e3e46
am: ddaeb30d5b

* commit 'ddaeb30d5b7c4e11a7c419db85c07c813b3d6195':
  Frameworks/base: Shorten system property

Change-Id: Icfa9d162d88135d24cef8cefd77f72e7c2589910
2016-05-10 20:05:41 +00:00
Andreas Gampe
ddaeb30d5b Merge "Frameworks/base: Shorten system property" into nyc-dev
am: a8f51e3e46

* commit 'a8f51e3e46c705b0477bf20a8e417ab57e09afee':
  Frameworks/base: Shorten system property

Change-Id: I9e90c9ed260cd74f1585d5851c65a6c78f245daf
2016-05-10 20:02:44 +00:00
Andreas Gampe
95ac395662 Merge "Frameworks/base: Shorten system property" into nyc-dev
am: a8f51e3e46

* commit 'a8f51e3e46c705b0477bf20a8e417ab57e09afee':
  Frameworks/base: Shorten system property

Change-Id: I863f60e821dcdd0290e0e7197c69aa0eabda2691
2016-05-10 20:02:41 +00:00