Commit Graph

56282 Commits

Author SHA1 Message Date
Muyuan Li
b7c69150c8 Merge "Allows components to register shortcut key." into nyc-dev am: 187b9b9e5b
am: 1673ab1ead

* commit '1673ab1ead05b452b40380d921d92fcb8ebb5623':
  Allows components to register shortcut key.
2016-02-26 23:20:54 +00:00
Muyuan Li
1673ab1ead Merge "Allows components to register shortcut key." into nyc-dev
am: 187b9b9e5b

* commit '187b9b9e5bb3c6a83a26f2ece23a6cfa16614d03':
  Allows components to register shortcut key.
2016-02-26 22:50:25 +00:00
Muyuan Li
94ce94e960 Allows components to register shortcut key.
The registered shortcut will be called from PhoneWindowManager,
before dispatching

Change-Id: If26128939b45a639c8895719a7a23ca433f39fd9
(cherry picked from commit 4da863c5a8872dcabb179a978a2b2157d9081679)
2016-02-26 22:30:34 +00:00
Oren Blasberg
872e981f80 Merge "WallpaperManager: support custom default cropper." into nyc-dev am: 203b353018
am: b53eef9256

* commit 'b53eef9256b898a4f974f94d7956a0ac09046732':
  WallpaperManager: support custom default cropper.
2016-02-26 22:18:46 +00:00
Oren Blasberg
b53eef9256 Merge "WallpaperManager: support custom default cropper." into nyc-dev
am: 203b353018

* commit '203b353018e1533251528b087345cc9933aa38fe':
  WallpaperManager: support custom default cropper.
2016-02-26 22:15:17 +00:00
Oren Blasberg
203b353018 Merge "WallpaperManager: support custom default cropper." into nyc-dev 2016-02-26 22:09:54 +00:00
Oren Blasberg
60598ea0aa WallpaperManager: support custom default cropper.
If the component name is specified by the OEM, that component is used
as the default (fallback) cropper rather than
com.android.wallpapercropper.

Bug: 26084319
Change-Id: I5c79beb8e84721944e752bda637cdf0377b8d826
2016-02-26 13:19:30 -08:00
John Reck
6c9d87e29e Merge "Don\'t lose mInitialized in onStop()" into nyc-dev am: 79722c27c6
am: 4288e399b2

* commit '4288e399b283817ea6170755f74d68fb498cb5be':
  Don't lose mInitialized in onStop()
2016-02-26 21:15:53 +00:00
Julia Reynolds
aae8cf11b2 Merge "Api review: NotificationManager" into nyc-dev am: 01e81117a9
am: 2b53b701d8

* commit '2b53b701d8a51a8029fd90dea33732073d6018a7':
  Api review: NotificationManager
2016-02-26 21:09:08 +00:00
John Reck
4288e399b2 Merge "Don\'t lose mInitialized in onStop()" into nyc-dev
am: 79722c27c6

* commit '79722c27c6ccec529e31bdcaeddf76aa90d409a1':
  Don't lose mInitialized in onStop()
2016-02-26 21:07:53 +00:00
Julia Reynolds
c8999e8470 Merge "Api review: Notification.Builder" into nyc-dev am: 1adc816f2d
am: 92a187ddaf

* commit '92a187ddaf27a6783b2628d39227d64e39492a4a':
  Api review: Notification.Builder
2016-02-26 21:05:05 +00:00
Julia Reynolds
2b53b701d8 Merge "Api review: NotificationManager" into nyc-dev
am: 01e81117a9

* commit '01e81117a9bc86849f0bf20d7729c8f8101b0baf':
  Api review: NotificationManager
2016-02-26 21:03:47 +00:00
Chong Zhang
a0f805b885 Merge "Do not stop window if preserving the window" into nyc-dev am: fd3d5e92ea
am: fb3403f5f0

* commit 'fb3403f5f0655f77d75aac017bc5f9e60f221f59':
  Do not stop window if preserving the window
2016-02-26 21:03:47 +00:00
John Reck
79722c27c6 Merge "Don't lose mInitialized in onStop()" into nyc-dev 2016-02-26 21:00:27 +00:00
Julia Reynolds
92a187ddaf Merge "Api review: Notification.Builder" into nyc-dev
am: 1adc816f2d

* commit '1adc816f2dcf0a827b4619eb21a780d1b3d827b3':
  Api review: Notification.Builder
2016-02-26 21:00:21 +00:00
Chong Zhang
fb3403f5f0 Merge "Do not stop window if preserving the window" into nyc-dev
am: fd3d5e92ea

* commit 'fd3d5e92ea05ca20e6c3700e2309d849d96f2f7d':
  Do not stop window if preserving the window
2016-02-26 20:58:32 +00:00
John Reck
f4db3d253e Don't lose mInitialized in onStop()
Bug: 27350647
Change-Id: I74e6427ac4030645c416efb24948efdbdc90fa1c
2016-02-26 12:58:17 -08:00
Jorim Jaggi
a7a1e1d3bf Merge "App transition delay tracking" into nyc-dev am: a8914a0096
am: b6b9eee960

* commit 'b6b9eee960b21e6cfc5955b4dba1c3d454a86ce5':
  App transition delay tracking
2016-02-26 20:58:05 +00:00
Julia Reynolds
01e81117a9 Merge "Api review: NotificationManager" into nyc-dev 2016-02-26 20:56:27 +00:00
Jorim Jaggi
b6b9eee960 Merge "App transition delay tracking" into nyc-dev
am: a8914a0096

* commit 'a8914a00969b6942211d29fd923b0692a1b70f9a':
  App transition delay tracking
2016-02-26 20:56:03 +00:00
Julia Reynolds
1adc816f2d Merge "Api review: Notification.Builder" into nyc-dev 2016-02-26 20:52:21 +00:00
Chong Zhang
fd3d5e92ea Merge "Do not stop window if preserving the window" into nyc-dev 2016-02-26 20:52:17 +00:00
Jorim Jaggi
a8914a0096 Merge "App transition delay tracking" into nyc-dev 2016-02-26 20:51:40 +00:00
Julia Reynolds
0edb50c4bf Api review: NotificationManager
Bug: 27365672
Change-Id: Ic0fd82fb9442d10d6b308182a3859497aa882d07
2016-02-26 15:44:41 -05:00
Julia Reynolds
3b84812271 Api review: Notification.Builder
Bug: 27364889
Change-Id: I95cee3336f1adb64e37e71a9ab40e68feb1d9c5b
2016-02-26 15:44:02 -05:00
Chong Zhang
7687f25e58 Do not stop window if preserving the window
bug: 27350647
Change-Id: I670d2641ee7e600a6ea46f7b329afd4df10a3862
2016-02-26 12:37:00 -08:00
Jorim Jaggi
275561a746 App transition delay tracking
Add TRON logging for all kinds aspects when we execute an app transition.

Bug: 27295491
Change-Id: Icb0cbdb92d4d5fbfedadd40a017a50eb217058aa
2016-02-26 14:15:00 -05:00
Selim Cinek
f1a8cedbad Merge "Added convenience methods to use chronometer countdown methods" into nyc-dev am: a94742c7f9
am: 39e1cc558b

* commit '39e1cc558bf6f3f7442f553a36f8ba88375b58e6':
  Added convenience methods to use chronometer countdown methods
2016-02-26 19:10:28 +00:00
Selim Cinek
39e1cc558b Merge "Added convenience methods to use chronometer countdown methods" into nyc-dev
am: a94742c7f9

* commit 'a94742c7f9b6287c97a5cd47cf6542ce25e86513':
  Added convenience methods to use chronometer countdown methods
2016-02-26 19:08:33 +00:00
Selim Cinek
a94742c7f9 Merge "Added convenience methods to use chronometer countdown methods" into nyc-dev 2016-02-26 19:05:04 +00:00
Dianne Hackborn
88d47f16dc Merge "Work on issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev am: 77ca74d941
am: 387ae4971d

* commit '387ae4971dbf806878a0a81da0523aaf45fb1c5b':
  Work on issue #26390161: Throttle syncs/jobs when system is low on RAM
2016-02-26 18:51:01 +00:00
Dianne Hackborn
387ae4971d Merge "Work on issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev
am: 77ca74d941

* commit '77ca74d941eb4addd7051c747362bace0746b7a7':
  Work on issue #26390161: Throttle syncs/jobs when system is low on RAM
2016-02-26 18:47:53 +00:00
Dianne Hackborn
77ca74d941 Merge "Work on issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev 2016-02-26 18:44:55 +00:00
Jeff Sharkey
c726efeccc Merge "When system server goes down, crash apps." into nyc-dev am: 49607029be
am: de6fe0c800

* commit 'de6fe0c80019430880edab225051fb81b9db927c':
  When system server goes down, crash apps.
2016-02-26 18:26:28 +00:00
Dimitry Ivanov
5b0dca11ea Merge "Create linker-namespace for the classloader" into nyc-dev am: 1a2cb453fa
am: 155e89f4dd

* commit '155e89f4ddd2754fefac217d767602f06e5422f8':
  Create linker-namespace for the classloader
2016-02-26 18:23:17 +00:00
Jeff Sharkey
de6fe0c800 Merge "When system server goes down, crash apps." into nyc-dev
am: 49607029be

* commit '49607029bef037d162f64f841468d7b99d862489':
  When system server goes down, crash apps.
2016-02-26 18:19:22 +00:00
Jeff Sharkey
49607029be Merge "When system server goes down, crash apps." into nyc-dev 2016-02-26 18:14:52 +00:00
Dimitry Ivanov
155e89f4dd Merge "Create linker-namespace for the classloader" into nyc-dev
am: 1a2cb453fa

* commit '1a2cb453fa8204db84d92fd2de92b0ed1e546a03':
  Create linker-namespace for the classloader
2016-02-26 18:10:23 +00:00
Dimitry Ivanov
1a2cb453fa Merge "Create linker-namespace for the classloader" into nyc-dev 2016-02-26 18:03:56 +00:00
Andreas Gampe
0ee49af897 Merge "Frameworks/base: Refactor android.os.Debug" into nyc-dev am: 227d7854cc
am: b0751f90f8

* commit 'b0751f90f8aadd81453e4cb250982d565a283a0a':
  Frameworks/base: Refactor android.os.Debug
2016-02-26 17:44:51 +00:00
Andreas Gampe
b0751f90f8 Merge "Frameworks/base: Refactor android.os.Debug" into nyc-dev
am: 227d7854cc

* commit '227d7854cc0fa5c76a61df727c97edb618f17046':
  Frameworks/base: Refactor android.os.Debug
2016-02-26 17:42:24 +00:00
Andreas Gampe
227d7854cc Merge "Frameworks/base: Refactor android.os.Debug" into nyc-dev 2016-02-26 17:39:20 +00:00
Julia Reynolds
5a207e0bd9 Merge "Introduce IMPORTANCE_MIN." into nyc-dev am: abf11299b7
am: cb64b53fd3

* commit 'cb64b53fd37291e0e932af90e42ffe711f9031b9':
  Introduce IMPORTANCE_MIN.
2016-02-26 16:24:30 +00:00
Julia Reynolds
cb64b53fd3 Merge "Introduce IMPORTANCE_MIN." into nyc-dev
am: abf11299b7

* commit 'abf11299b78596e4ed4e0dcb4bacb6ff6318b010':
  Introduce IMPORTANCE_MIN.
2016-02-26 16:19:07 +00:00
Julia Reynolds
f0f629ffe4 Introduce IMPORTANCE_MIN.
Allow HUNs for >= IMPORTANCE_HIGH.
Allow full screen intents for IMPORTANCE_MAX.

Bug: 22960980
Bug: 26918284
Change-Id: Id4d2b90ea2e21563dbc716db411060d826e73699
2016-02-26 10:54:08 -05:00
Ruchi Kandoi
185101f1cb Merge "PowerManager: Hide the SUSTAINED_PERFORMANCE API." into nyc-dev am: 52cdc1593a
am: b2e2db084a

* commit 'b2e2db084af7ea00a2cdd68487971d78c09963fe':
  PowerManager: Hide the SUSTAINED_PERFORMANCE API.
2016-02-26 02:33:53 +00:00
Ruchi Kandoi
b2e2db084a Merge "PowerManager: Hide the SUSTAINED_PERFORMANCE API." into nyc-dev
am: 52cdc1593a

* commit '52cdc1593aab9336ad06cfe54cd06ca42ab3837e':
  PowerManager: Hide the SUSTAINED_PERFORMANCE API.
2016-02-26 02:30:41 +00:00
Ruchi Kandoi
52cdc1593a Merge "PowerManager: Hide the SUSTAINED_PERFORMANCE API." into nyc-dev 2016-02-26 02:26:56 +00:00
Thierry Strudel
22be410b18 Merge "Fix typo in SwappedOut reporting" into nyc-dev am: f40969ac2c
am: b7f515cf9b

* commit 'b7f515cf9b35a2ccee3c9999febc1955f8858596':
  Fix typo in SwappedOut reporting
2016-02-26 02:08:53 +00:00
Christopher Tate
8c6eb7c110 Merge "Fix \'<\' / \'>\' in JobService docs" into nyc-dev am: 7f220b8ec5
am: 2973c936e5

* commit '2973c936e51ccf3da5731ccd9d6f2d2307737677':
  Fix '<' / '>' in JobService docs
2016-02-26 02:07:34 +00:00