Commit Graph

249922 Commits

Author SHA1 Message Date
Hemal Patel
6501ac3bf9 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51
am: 2b9497069d

* commit '2b9497069dbabdd1f3fd6668c86922d52b9246fd':
  Docs: Removed note in "Platform Versions" section

Change-Id: I172d2d3ccef84e13dbd6167c60a91f938fae0102
2016-05-27 21:48:36 +00:00
Hemal Patel
3921ba2f61 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev
am: d63315e535

* commit 'd63315e535e57eb949feb4238cc31832a76a6229':
  Docs: Fixed the end-of-comment tag

Change-Id: I463b3de64c12e0619677dd5d4ecd83c74f70528e
2016-05-27 21:45:52 +00:00
Michael Wright
7eb543ef2c Merge "Revert "Finalize resource IDs for N."" into nyc-dev
am: 82a8c5f246

* commit '82a8c5f24653baf98a77f050f14e7256e864cbf9':
  Revert "Finalize resource IDs for N."

Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd
2016-05-27 21:45:48 +00:00
Hemal Patel
2b9497069d Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
am: 7a62915c51

* commit '7a62915c51294fcbf491fbe0f0a406ac420e2d34':
  Docs: Removed note in "Platform Versions" section

Change-Id: I4da67d6b00c0e33f6eb99b06479bafb8049f1b8b
2016-05-27 21:45:39 +00:00
Android Build Merger (Role)
d63315e535 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev 2016-05-27 21:42:25 +00:00
Hemal Patel
5c1cd3ec6c Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
am: 7ff4ee303b

* commit '7ff4ee303bca5372a925453e043375a728eb8d1d':
  Docs: Fixed the end-of-comment tag

Change-Id: I79abb2406163de3928ec9bb473e18c31aa146efa
2016-05-27 21:41:57 +00:00
Hemal Patel
7a62915c51 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs
am: 9dfa75ef43

* commit '9dfa75ef43782c596d55de582704566afc540d06':
  Docs: Removed note in "Platform Versions" section

Change-Id: Ie09047db04155b7f37aafdc3ac6a85e390d54143
2016-05-27 21:41:43 +00:00
Akshay Thakker
82a8c5f246 Merge "Revert "Finalize resource IDs for N."" into nyc-dev 2016-05-27 21:41:26 +00:00
Hemal Patel
7ff4ee303b Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs
am: d09caa1378

* commit 'd09caa137854596bb082188b7073eead8b844449':
  Docs: Fixed the end-of-comment tag

Change-Id: I27a07c1d00f840b34683cfb333b8b338ffe60dd3
2016-05-27 21:37:15 +00:00
Christopher Tate
447e93dffc Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev
am: bf932b0067

* commit 'bf932b006743e25e50f5e493b011e520141536d1':
  Purge an app's scheduled jobs when the whole package is disabled

Change-Id: Id2964531b7332369a30fabfaf2c9cf9167737c6b
2016-05-27 21:33:04 +00:00
Hemal Patel
9dfa75ef43 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs 2016-05-27 21:32:05 +00:00
Hemal Patel
d09caa1378 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs 2016-05-27 21:31:24 +00:00
Adrian Roos
7aaf3aea00 Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev
am: e88f60b8bb

* commit 'e88f60b8bba7aeb6aa42f3baa78fa9a1e1767373':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I27794ef734161405862eac2446b51ae81145c8a2
2016-05-27 21:27:34 +00:00
Adrian Roos
389c4e67e9 Merge "Notification: Fix bug with sliding action list" into nyc-dev
am: 06fe24341c

* commit '06fe24341cd07cee044527cab61345355802fa54':
  Notification: Fix bug with sliding action list

Change-Id: Ib59010775d30fff796fc03ee9ed1881f3be0849e
2016-05-27 21:27:31 +00:00
Chris Tate
bf932b0067 Merge "Purge an app's scheduled jobs when the whole package is disabled" into nyc-dev 2016-05-27 21:26:17 +00:00
Greg Hackmann
cac03c5cdf Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051
am: 2c4b276df4

* commit '2c4b276df4ea5655d41b8e239ca44ef6559e485d':
  AlarmManagerService: remove legacy /dev/alarm support

Change-Id: I4cb2036c9a06adaaf9b93bc35821106dc2144c67
2016-05-27 21:25:54 +00:00
Adrian Roos
e88f60b8bb Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev 2016-05-27 21:18:57 +00:00
Greg Hackmann
2c4b276df4 Merge "AlarmManagerService: remove legacy /dev/alarm support"
am: 1f336bb051

* commit '1f336bb051e4d11ff3f8cdc2aa9486116c3f2b34':
  AlarmManagerService: remove legacy /dev/alarm support

Change-Id: Iaf69b28333c62572327d8a4362e714a7a5e44de2
2016-05-27 21:18:22 +00:00
Adrian Roos
06fe24341c Merge "Notification: Fix bug with sliding action list" into nyc-dev 2016-05-27 21:17:27 +00:00
Jorim Jaggi
1f1d754440 Fix weirdness when home task forces rotation
am: a6c05d5151

* commit 'a6c05d5151027f902c5c56bded008cbe15bd6301':
  Fix weirdness when home task forces rotation

Change-Id: If9266da74110928a7eb7ee33ab9db1d85c4dc1ae
2016-05-27 21:15:32 +00:00
Jorim Jaggi
26dea2d518 Merge "Close IME when attaching dock stack" into nyc-dev
am: c5fc6c602c

* commit 'c5fc6c602c16f0e985d8f8ba7f94075229e52320':
  Close IME when attaching dock stack

Change-Id: I40abf80fcea522c8082e622c33f3a6726f781145
2016-05-27 21:15:26 +00:00
Chong Zhang
78b9d20449 Merge "Revert commits related to wallpaper cropping" into nyc-dev
am: 0b56cc2804

* commit '0b56cc2804a8cd60bc4a4a0c2870236ffa15e68a':
  Revert commits related to wallpaper cropping

Change-Id: I4475e2ce6818da6e1deb256662f149aad30bc342
2016-05-27 21:15:21 +00:00
Treehugger Robot
1f336bb051 Merge "AlarmManagerService: remove legacy /dev/alarm support" 2016-05-27 21:12:15 +00:00
Jorim Jaggi
a6c05d5151 Fix weirdness when home task forces rotation
- Make sure to retain the state when divider goes through a configuration
change in order to avoid that nothing happens when entering multi-window.
Save the state in DividerState and use a handler that's independant of the
attached state.
- Don't allow home task to dictate orientation unless the docked stack is
minimized. This caused a lot of weird bugs because when docking a task,
home stack gets moved to front, and if home task is front of stack, it
temporarily might dictate the rotation but later not anymore so this
causes two rapid configuration changes which may cause a lot of weirdness.

Change-Id: I6a2308af893cd8413ee8801e5b964f6ddc0abd51
Fixes: 28943853
2016-05-27 21:09:22 +00:00
Jorim Jaggi
c5fc6c602c Merge "Close IME when attaching dock stack" into nyc-dev 2016-05-27 21:08:51 +00:00
Chong Zhang
0b56cc2804 Merge "Revert commits related to wallpaper cropping" into nyc-dev 2016-05-27 21:08:41 +00:00
Jorim Jaggi
3c5d0f1041 Close IME when attaching dock stack
So we don't end up with animation weirdness.

Bug: 28905720
Change-Id: I04124995dd99fa26d2e9be467c5976d7b20810a7
2016-05-27 21:08:39 +00:00
Selim Cinek
fb9d25e14a Merge "Added strings for translation with the expand affordance" into nyc-dev
am: 08c46581a2

* commit '08c46581a28a90c108e6a548f39a829446464d4d':
  Added strings for translation with the expand affordance

Change-Id: Iedf280b61c678bd97054e07acae7466760aed5dd
2016-05-27 20:53:17 +00:00
Selim Cinek
0d33e08779 Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev
am: 2fba229166

* commit '2fba229166213fe755ce9d1c982ff191e885c854':
  Fixed a bug where a notification could be stuck in the overlay

Change-Id: I139233be3769760c0b7b9730a246cc6358dbd21f
2016-05-27 20:53:10 +00:00
Selim Cinek
08c46581a2 Merge "Added strings for translation with the expand affordance" into nyc-dev 2016-05-27 20:47:22 +00:00
Selim Cinek
2fba229166 Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev 2016-05-27 20:47:07 +00:00
Felipe Leme
feaa8982fc Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: I11bf96280ac5e143d5260cb20238da38b4e0eaa3
2016-05-27 20:04:25 +00:00
Chong Zhang
741c0ba8aa Revert commits related to wallpaper cropping
bug: 28763785
related-to: 27989717
related-to: 28887408

Revert "Fix wallpaper crop during unlock animation"

This reverts commit 616c7c10b9.

Revert "Fix wallpaper cropped too soon when unminimizing dock"

This reverts commit f0b76b071c.

Revert "Set final crop on wallpaper instead of intersect clip with stack bounds"

This reverts commit dcf0183cea.

Revert "Crop wallpaper windows to their current target stack bounds"

This reverts commit e6cb450b0d.
2016-05-27 13:01:48 -07:00
TreeHugger Robot
efa291a860 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent." into nyc-dev 2016-05-27 19:58:24 +00:00
Greg Hackmann
f68cdb9cb4 AlarmManagerService: remove legacy /dev/alarm support
We've removed the Android alarm driver from our supported kernels.  It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.

Bug: 28357356

Change-Id: I225d76c3f4e695a831d4419e050e8e178e1224b5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2016-05-27 12:55:02 -07:00
Selim Cinek
9d84d9ee51 Added strings for translation with the expand affordance
Bug: 28069681
Change-Id: Ifebc146ed249e6133625607cfc361957e4491882
2016-05-27 12:14:20 -07:00
Selim Cinek
077ba466d4 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev
am: 4f401f24c7

* commit '4f401f24c79c26a0554331bf13948e402c611015':
  Fixed a few memory leaks in SystemUI

Change-Id: Ief7f5bd3a0386ec2187ec4adf9c23463a9375bd7
2016-05-27 19:05:57 +00:00
Selim Cinek
4f401f24c7 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev 2016-05-27 18:58:56 +00:00
Siyamed Sinir
6fe1ab7f21 Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
am: 990e26118d

* commit '990e26118d5b6cad2d34483b1908ba6f8334a764':
  Revert "Fix TextView layout reuse when maxLines is set"

Change-Id: I543c1944fafb920b697eb87c92cf0d4ae8339e54
2016-05-27 18:50:51 +00:00
Siyamed Sinir
361f03c4e2 Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
am: 92d0316d28

* commit '92d0316d2837baceffb22e1a7eb0e5da50f0a025':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: I2b0281da1d8aba5f84da01c00f31d79af901db35
2016-05-27 18:45:20 +00:00
Felipe Leme
a1b79bfd7a Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.
This scenario typically happens when the device is on Doze Mode and a
notification action is triggered from a Wear device.

In a nutshell, the workflow is:

- ProcessRecord has a flag telling whether a process has "whitelist
  management" privileges.
- When NotificationManager binds a new NotificationListenerService, it
  sets the BIND_ALLOW_WHITELIST_MANAGEMENT flag.
- On bind(), ActiveService asserts that only system apps can set that
  flag.
- On computeOomAdjLocked(), ActivityManagerService sets the
  ProcessRecord flag if necessary.
- Upon creating a notification, NotificationManager calls AM to mark its
  PendingIntents as coming from a notification.
- When PendingIntentRecord sends it to the target, it checks if it's
  from a notification and if so calls AM to do the temp whitelist.
- On unbind(), ActiveService removes the ProcessRecord flag if necessary.

Fixes: 28818704

Change-Id: I00d46036a2cbb73f7f733fd35bf0b743a02807a1
2016-05-27 11:45:09 -07:00
Siyamed Sinir
990e26118d Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev 2016-05-27 18:34:30 +00:00
Siyamed Sinir
92d0316d28 Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev 2016-05-27 18:34:30 +00:00
Selim Cinek
f55f1bcb94 Fixed a bug where a notification could be stuck in the overlay
Change-Id: Idf07b1948b9baeff095fbeccd417cdad1e81e7f8
Fixes: 28992452
2016-05-27 11:19:11 -07:00
Chih-hung Hsieh
86f5b560af Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361
am: cfae35a400

* commit 'cfae35a4007316cdff280ecce3d71d8d6074bccc':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I0e6297b1e2182d4209bf6744e9d35e574883d7da
2016-05-27 18:16:02 +00:00
Mark Goldstein
90045710ca Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3
am: 7f1330358a

* commit '7f1330358ac8037e440f0a66f9abed0f5db0481f':
  Doc change: Fix broken link.

Change-Id: I539b08283eee0c0d00fb5c04a97fd01c02780dd4
2016-05-27 18:09:54 +00:00
Chih-Hung Hsieh
cfae35a400 Merge "Fix misc-macro-parentheses warnings in DngCreator."
am: d439efc361

* commit 'd439efc361535701f6d2d0b82cfa22b9d4a5898b':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I5fd1127ff3efde3b44ac6d358d48665f89d54e01
2016-05-27 18:09:49 +00:00
Mark Goldstein
7f1330358a Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb
am: f9d8f6c5f3

* commit 'f9d8f6c5f36b07961f2d38b43c991ed679022f7e':
  Doc change: Fix broken link.

Change-Id: Iee76c1e357f2c67362d951f567bc3498c208fb35
2016-05-27 17:57:50 +00:00
Chih-hung Hsieh
d439efc361 Merge "Fix misc-macro-parentheses warnings in DngCreator." 2016-05-27 17:56:46 +00:00
Mark Goldstein
f9d8f6c5f3 Merge "Doc change: Fix broken link." into mnc-io-docs
am: d643ab1ddb

* commit 'd643ab1ddb737aeb6636c61839cb64bdc7348c04':
  Doc change: Fix broken link.

Change-Id: Ia1a9fdd18486ecf34d4a577f0e7f9d9570f748a3
2016-05-27 17:46:38 +00:00