Commit Graph

38859 Commits

Author SHA1 Message Date
Robert Carr
d1954e723e Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325 am: ea84ad75d3
am: 62be08241f

* commit '62be08241f57ffc9c636b06ff6d83e110725df6d':
  Fix surfaceInset adjustment.

Change-Id: I8f22e2876dd768a1ecf739a883c21f79d787f2b5
2016-05-12 19:07:13 +00:00
Robert Carr
62be08241f Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325
am: ea84ad75d3

* commit 'ea84ad75d3e5f9244238c32154cffaab21bda58a':
  Fix surfaceInset adjustment.

Change-Id: I37b96b4a773e9f53bd143fc1f55a9f633794f8b2
2016-05-12 19:04:32 +00:00
Robert Carr
ea84ad75d3 Merge "Fix surfaceInset adjustment." into nyc-dev
am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I9274121cdbd8ea8ed656478b98d6cd4b740834b8
2016-05-12 19:01:46 +00:00
TreeHugger Robot
663330a325 Merge "Fix surfaceInset adjustment." into nyc-dev 2016-05-12 18:57:58 +00:00
Phil Weaver
2d85fd839e Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 am: 14a9987d99
am: a6f2153953

* commit 'a6f2153953876e6b16a0285bde4f35c5e40ceaea':
  Don't disrupt a11y state when user is unlocked.

Change-Id: Id741cc938e24c534f52f9f1ff92045fb08dec3f3
2016-05-12 18:13:35 +00:00
Phil Weaver
a6f2153953 Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24
am: 14a9987d99

* commit '14a9987d991d5fe47ac5e2d6154bbd90fd87631a':
  Don't disrupt a11y state when user is unlocked.

Change-Id: I5bea2b2da3b28667b51c8cc8aa0a416ac6274a8e
2016-05-12 18:10:33 +00:00
Phil Weaver
14a9987d99 Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev
am: 18e9f13b24

* commit '18e9f13b24867fb4a41391c5512376db413449a8':
  Don't disrupt a11y state when user is unlocked.

Change-Id: Ic5ad0d452e5296edecec98bdfc08b6ea8ad3c9da
2016-05-12 18:07:35 +00:00
Phil Weaver
b60d029ed2 Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev
am: 18e9f13b24

* commit '18e9f13b24867fb4a41391c5512376db413449a8':
  Don't disrupt a11y state when user is unlocked.

Change-Id: I03a057fb4278466250395958252a349d4dfe2e3c
2016-05-12 18:07:32 +00:00
Phil Weaver
18e9f13b24 Merge "Don't disrupt a11y state when user is unlocked." into nyc-dev 2016-05-12 18:00:55 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
Richard Uhler
2a81ea9a0b Merge "Fix --reset argument to \'cmd package compile\'." into nyc-dev am: e4a3e5e8f1 am: a68dc2ed55
am: ef6ba8c4e3

* commit 'ef6ba8c4e3ac901586f498d7836c6a3f0b784859':
  Fix --reset argument to 'cmd package compile'.

Change-Id: I192bcef71bb72b89b8101f16dec9a85b996d6190
2016-05-12 15:23:24 +00:00
Richard Uhler
ef6ba8c4e3 Merge "Fix --reset argument to \'cmd package compile\'." into nyc-dev am: e4a3e5e8f1
am: a68dc2ed55

* commit 'a68dc2ed5588a16ec7432e46e899ce54103805bb':
  Fix --reset argument to 'cmd package compile'.

Change-Id: I876fccbc3cd192e4ef08a5d249f6a7583b48bb9a
2016-05-12 15:20:14 +00:00
Richard Uhler
a68dc2ed55 Merge "Fix --reset argument to \'cmd package compile\'." into nyc-dev
am: e4a3e5e8f1

* commit 'e4a3e5e8f13c4290e3e4c5667bedcd66ce699e63':
  Fix --reset argument to 'cmd package compile'.

Change-Id: I26533be1c9c2dac22b8ff4a5882abc8ded832255
2016-05-12 15:17:37 +00:00
Richard Uhler
d698bf64b2 Merge "Fix --reset argument to \'cmd package compile\'." into nyc-dev
am: e4a3e5e8f1

* commit 'e4a3e5e8f13c4290e3e4c5667bedcd66ce699e63':
  Fix --reset argument to 'cmd package compile'.

Change-Id: Ie171523d64aa8ecd38bba3067756f3736f4ae0ef
2016-05-12 15:17:36 +00:00
Richard Uhler
e4a3e5e8f1 Merge "Fix --reset argument to 'cmd package compile'." into nyc-dev 2016-05-12 15:13:04 +00:00
Jaewan Kim
9c0df37ec9 Merge "Fix continous crash in WindowManager in boot" into nyc-dev am: 927b6be3d9 am: 1f7f01ec77
am: 0cf458ca4a

* commit '0cf458ca4adea3ba6040601aed4d5eedf777e05c':
  Fix continous crash in WindowManager in boot

Change-Id: I280b25ee9ff7cffeec8390027b59f75464fc99fa
2016-05-12 12:40:39 +00:00
Jaewan Kim
0cf458ca4a Merge "Fix continous crash in WindowManager in boot" into nyc-dev am: 927b6be3d9
am: 1f7f01ec77

* commit '1f7f01ec777a4d1fc510dadb1d0f8acbb1d56003':
  Fix continous crash in WindowManager in boot

Change-Id: I7572be9a42b89b87b87bcfc5205db6263d17a802
2016-05-12 12:38:11 +00:00
Jaewan Kim
9504c65986 Merge "Fix continous crash in WindowManager in boot" into nyc-dev
am: 927b6be3d9

* commit '927b6be3d960a42bbc75aacc8dcde792a1d564b4':
  Fix continous crash in WindowManager in boot

Change-Id: I78ae3c06ee5905c55adefa1c03391a25302c3c6a
2016-05-12 12:35:43 +00:00
Jaewan Kim
1f7f01ec77 Merge "Fix continous crash in WindowManager in boot" into nyc-dev
am: 927b6be3d9

* commit '927b6be3d960a42bbc75aacc8dcde792a1d564b4':
  Fix continous crash in WindowManager in boot

Change-Id: I6207c320404ff1f0fed5284afe550a9163ea78a7
2016-05-12 12:35:42 +00:00
Jaewan Kim
927b6be3d9 Merge "Fix continous crash in WindowManager in boot" into nyc-dev 2016-05-12 12:32:01 +00:00
Jaewan Kim
3328433f13 Fix continous crash in WindowManager in boot
Bug: 28728894
Change-Id: I660e2709a674eb4089dbb38173375491a87828db
2016-05-12 21:29:26 +09:00
Calin Juravle
580f96f039 Merge "Do not clear profiles after OTAs" into nyc-dev am: 4ee1c943ab am: 4dd3486a00
am: 08483bb086

* commit '08483bb086102f5c827d708b03b9807df7a48dcb':
  Do not clear profiles after OTAs

Change-Id: I8af897ed8ce936cfb2c3c75c349345e7c731cec3
2016-05-12 10:05:26 +00:00
Calin Juravle
08483bb086 Merge "Do not clear profiles after OTAs" into nyc-dev am: 4ee1c943ab
am: 4dd3486a00

* commit '4dd3486a00c757f6e62b0e46c05dff3fe01ac43c':
  Do not clear profiles after OTAs

Change-Id: I1babef42a91b71d36b9c51a1d7d816976f2059b8
2016-05-12 10:03:06 +00:00
Calin Juravle
4dd3486a00 Merge "Do not clear profiles after OTAs" into nyc-dev
am: 4ee1c943ab

* commit '4ee1c943ab5f7f69355d1413bca981812a804a67':
  Do not clear profiles after OTAs

Change-Id: Ia1348266a52fae102db02b76c089bea26da14793
2016-05-12 10:00:39 +00:00
Calin Juravle
9f706d50bc Merge "Do not clear profiles after OTAs" into nyc-dev
am: 4ee1c943ab

* commit '4ee1c943ab5f7f69355d1413bca981812a804a67':
  Do not clear profiles after OTAs

Change-Id: Icf79d5c8eef4006fba3a5eb118d9882b02b36fb7
2016-05-12 10:00:36 +00:00
TreeHugger Robot
4ee1c943ab Merge "Do not clear profiles after OTAs" into nyc-dev 2016-05-12 09:52:56 +00:00
Donghyun Cho
212c3d53a7 Merge "docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 5ea88aad9d am: 1ee7930329 am: 29bcedc4b1 am: 9ac566bb93
am: 257c7c7459

* commit '257c7c74595f051768450ea9f1abf156d9d19517':
  CEC: Update system audio mode based on the current status of AVR

Change-Id: Ie38de3a4eea26522333c0300159f6399b730b7ba
2016-05-12 02:42:16 +00:00
Kevin Hufnagle
257c7c7459 Merge "docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 5ea88aad9d am: 1ee7930329 am: 29bcedc4b1
am: 9ac566bb93

* commit '9ac566bb935f5485dcabf8ac8d3ea55d3dd35b55':
  CEC: Update system audio mode based on the current status of AVR

Change-Id: I6867d716d99c6306cd4548667ac55637aa2baf57
2016-05-12 02:22:36 +00:00
Donghyun Cho
9ac566bb93 Merge "CEC: Update system audio mode based on the current status of AVR" into nyc-dev
am: 3cba679778

* commit '3cba6797783288f5eedf7836b815dbcc49a555b5':
  CEC: Update system audio mode based on the current status of AVR

Change-Id: Ie903e3af9c54ece2c8dced2516243b8f866d6514
2016-05-12 02:11:07 +00:00
Donghyun Cho
6d780da9f9 Merge "CEC: Update system audio mode based on the current status of AVR" into nyc-dev
am: 3cba679778

* commit '3cba6797783288f5eedf7836b815dbcc49a555b5':
  CEC: Update system audio mode based on the current status of AVR

Change-Id: I268ff7567b147ffe49243aa8c23ee5f490755c91
2016-05-12 02:10:59 +00:00
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +00:00
Donghyun Cho
3cba679778 Merge "CEC: Update system audio mode based on the current status of AVR" into nyc-dev 2016-05-12 02:05:11 +00:00
Jorim Jaggi
ad94d9ac26 Merge "Fix smallest width configuration calculation" into nyc-dev am: 63c09fd6cd
am: 3381482586

* commit '33814825861305032d930a95905b67c6120725b5':
  Fix smallest width configuration calculation

Change-Id: I5a380ded44ab27443c67660bb94ce4dcf47e0a17
2016-05-12 02:04:55 +00:00
Jorim Jaggi
3381482586 Merge "Fix smallest width configuration calculation" into nyc-dev
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Id753dcb396d31c8bb250581889fb190e396ecf6d
2016-05-12 01:55:14 +00:00
Jorim Jaggi
1e35919a09 Merge "Fix smallest width configuration calculation" into nyc-dev
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Iaca06abab9336d15fab5b2ec302a7a821e8f0103
2016-05-12 01:55:13 +00:00
Jorim Jaggi
63c09fd6cd Merge "Fix smallest width configuration calculation" into nyc-dev 2016-05-12 01:50:05 +00:00
Jorim Jaggi
8563943bd3 Fix smallest width configuration calculation
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.

In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.

Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes: 28469673
2016-05-11 18:33:01 -07:00
Adam Lesinski
ad3773a154 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev am: 3723194dc8
am: 04d676b3ae

* commit '04d676b3ae36bca3f3f80b522024121f2238835d':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Id439d6d314805f378bc068144eabd9a16a521f25
2016-05-12 01:23:54 +00:00
Adam Lesinski
04d676b3ae Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: I0b86c2bd861a7de788917c6bae7bccf02dc97b31
2016-05-12 01:11:21 +00:00
Adam Lesinski
ebfb372876 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Iafdc65be9a8045c10ee485685a4222ece087e031
2016-05-12 01:11:18 +00:00
Adam Lesinski
3723194dc8 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 2016-05-12 00:59:29 +00:00
Jim Miller
5d8a29e874 Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev am: 254d9e4f41
am: 3c1e640d83

* commit '3c1e640d8312c7cb2ff2e4f0ee374cd167a508bf':
  Fix KeyguardManager.isSecure() to observe work profile

Change-Id: I7a85b9f1da8a3cf19e731b6c949a654551de2dc7
2016-05-12 00:49:55 +00:00
Chris Tate
9e5b71ecf6 Merge "Fix iterator double-advance in ContentObserverController" into nyc-dev am: 9c2bb6da70
am: ca9879857c

* commit 'ca9879857c0f1c3edc2f05bedbf4a67939dcc2ce':
  Fix iterator double-advance in ContentObserverController

Change-Id: I45984f37d72e7a79658af45a2adaafb1f181ab5b
2016-05-12 00:48:25 +00:00
Chris Tate
578708fc69 Merge "Use Q=100 JPEG instead of PNG for wallpaper display" into nyc-dev am: 79c8a1fdf7
am: 97ba59e037

* commit '97ba59e0377dd178d127267d23551d4618d13779':
  Use Q=100 JPEG instead of PNG for wallpaper display

Change-Id: I9197b655c67ab64afd47904139312d00ccf2b0e9
2016-05-12 00:47:31 +00:00
Chong Zhang
01975eea60 Merge "Deliver new activity options after the activity is made visible" into nyc-dev am: e9f5d365bb am: 9396f7e64e
am: 5e5daca931

* commit '5e5daca931b36729eab5e8164efad5233c4302d2':
  Deliver new activity options after the activity is made visible

Change-Id: Icca5b70a150d1795669da2c09a5b3bf85fad12cb
2016-05-12 00:41:50 +00:00
Wale Ogunwale
8ae715ddeb Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev am: bc5446cba5 am: 28f247c19a
am: f36dda8de9

* commit 'f36dda8de999afcb258b897f5879014bfe7b5525':
  Crop wallpaper windows to their current target stack bounds

Change-Id: Ie18af20a6578101bd7f81367247b3f666ed38f24
2016-05-12 00:39:46 +00:00
Jim Miller
3c1e640d83 Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
am: 254d9e4f41

* commit '254d9e4f410f63ed1ba3f917e207731c5d9d6538':
  Fix KeyguardManager.isSecure() to observe work profile

Change-Id: Iaa814af0752a90ec53eed44b4d31b6bfdc13bfc3
2016-05-12 00:39:02 +00:00
Jim Miller
ca299c6fbd Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
am: 254d9e4f41

* commit '254d9e4f410f63ed1ba3f917e207731c5d9d6538':
  Fix KeyguardManager.isSecure() to observe work profile

Change-Id: I92f1387372cd02790f10f2940fdeb97ec6ab4a8f
2016-05-12 00:38:38 +00:00
Christopher Tate
ca9879857c Merge "Fix iterator double-advance in ContentObserverController" into nyc-dev
am: 9c2bb6da70

* commit '9c2bb6da700bc2fd64ccf3be04e4130550b95e92':
  Fix iterator double-advance in ContentObserverController

Change-Id: I081d7a6232f4a90b52e9e7fdbe8932c58efa4fc7
2016-05-12 00:37:20 +00:00