Selim Cinek
5f9a0ae10c
Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 am: 2e0e23b684
...
am: d7a22f64c3
* commit 'd7a22f64c37ca93696df1a9577aff4272f2f3222':
Fixed a crash when dumping groupmanager
Change-Id: I101e64e5dd5cc3fe41f5ec2aa91dcc821e802931
2016-05-12 19:22:02 +00:00
Selim Cinek
d7a22f64c3
Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08
...
am: 2e0e23b684
* commit '2e0e23b68473da94b7d5abda66735e7f1d9f619d':
Fixed a crash when dumping groupmanager
Change-Id: Ic6e6e07b46c1dc20e16f472982bd3f63e0e03311
2016-05-12 19:19:26 +00:00
Selim Cinek
2e0e23b684
Merge "Fixed a crash when dumping groupmanager" into nyc-dev
...
am: 95b3120d08
* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
Fixed a crash when dumping groupmanager
Change-Id: I28357779885b1d38acdc4579986293304fa11150
2016-05-12 19:16:59 +00:00
Selim Cinek
95b3120d08
Merge "Fixed a crash when dumping groupmanager" into nyc-dev
2016-05-12 19:09:59 +00:00
Jason Monk
32d7e37b4d
Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: 9f3141ebee
...
am: 9287a8ec4d
* commit '9287a8ec4d520f7402f1e8d47e7bb8f0dd6ca2fe':
Update demo mode time
Change-Id: I7acd614d6d224c412e9a0c4514f81688a32d8cef
2016-05-12 18:43:40 +00:00
Jason Monk
9287a8ec4d
Merge "Update demo mode time" into nyc-dev am: 341e37d349
...
am: 9f3141ebee
* commit '9f3141ebee6a1b06ff95532fe9bc9e95ef66c983':
Update demo mode time
Change-Id: Icbff19b62042d45494dc45dcfe87b4dbfbc98188
2016-05-12 18:41:02 +00:00
Jason Monk
9f3141ebee
Merge "Update demo mode time" into nyc-dev
...
am: 341e37d349
* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
Update demo mode time
Change-Id: I4bc09d1f87754c8ff648b2843219bcd941aee4d8
2016-05-12 18:38:27 +00:00
Jason Monk
341e37d349
Merge "Update demo mode time" into nyc-dev
2016-05-12 18:34:43 +00:00
Selim Cinek
60ca7879ec
Fixed a crash when dumping groupmanager
...
Change-Id: Id5ffb9e61c1a17d5bd7d8f58024bf84c0fbb6781
Fixes: 28706404
2016-05-12 18:26:32 +00:00
Jason Monk
7abe71c532
Update demo mode time
...
Change-Id: I50885c719ee06cb3fa8c3dda4fe5909efe1cb3e9
Fixes: 28740808
2016-05-12 14:05:18 -04:00
Philip P. Moltmann
6e4e946a7f
Merge "Handle failure to create file." into nyc-dev am: 808f2c361a am: 391dbbf022
...
am: f9f7adcc60
* commit 'f9f7adcc60eb3820178f649e32c950716828f7b6':
Handle failure to create file.
Change-Id: Ic000da20fe382f7f1fec1ed9460ddc10f7755c8a
2016-05-12 16:58:50 +00:00
Phil Weaver
0f82a5f261
Merge "Fix a race in settings update." into nyc-dev am: df15e03ed0 am: d56cd1fcab
...
am: f383e56846
* commit 'f383e56846057e968093bff2b4a1a5d157a7441e':
Fix a race in settings update.
Change-Id: I7c683987f51f2b90d1cf3a566c62b18c6606ab2d
2016-05-12 16:58:47 +00:00
Philip P. Moltmann
f9f7adcc60
Merge "Handle failure to create file." into nyc-dev am: 808f2c361a
...
am: 391dbbf022
* commit '391dbbf0226360238740016e238581113d012112':
Handle failure to create file.
Change-Id: Ia21bd48952e24439467fd6e804e9f5ec5a279180
2016-05-12 16:56:18 +00:00
Phil Weaver
f383e56846
Merge "Fix a race in settings update." into nyc-dev am: df15e03ed0
...
am: d56cd1fcab
* commit 'd56cd1fcab01b03aa6671522f0be6e69d7ec94fc':
Fix a race in settings update.
Change-Id: Ia9cee330dafdad14369ca5025ddc4d2710d76a59
2016-05-12 16:56:14 +00:00
Julia Reynolds
098a0d433a
resolve merge conflicts of 407c434 to nyc-mr1-dev am: 94ad652c7a
...
am: fbb267d4f4
* commit 'fbb267d4f4bec8f9225a10df47eb77d62633e91f':
Logging for QS settings launch.
Change-Id: Ic49fc7b7e062906f521ec9d39a373077ad0ac4b2
2016-05-12 16:56:12 +00:00
Philip P. Moltmann
391dbbf022
Merge "Handle failure to create file." into nyc-dev
...
am: 808f2c361a
* commit '808f2c361af328aad8d69a02779c37f08f1fa32d':
Handle failure to create file.
Change-Id: Ib48bb107c6a8d39768ac21a54f32cf18318ff357
2016-05-12 16:53:54 +00:00
Phil Weaver
d56cd1fcab
Merge "Fix a race in settings update." into nyc-dev
...
am: df15e03ed0
* commit 'df15e03ed062493b506f7599ff1e6aff26828485':
Fix a race in settings update.
Change-Id: I970606b21b1a5cd2d19e0f21077636e68f107c6b
2016-05-12 16:53:49 +00:00
Julia Reynolds
fbb267d4f4
resolve merge conflicts of 407c434 to nyc-mr1-dev
...
am: 94ad652c7a
* commit '94ad652c7a23d8464e2ac30a9c9de33e16431308':
Logging for QS settings launch.
Change-Id: Ic10a2f37a79211422758cd533994f1a30bb7e69e
2016-05-12 16:53:38 +00:00
Julia Reynolds
94ad652c7a
resolve merge conflicts of 407c434 to nyc-mr1-dev
...
Change-Id: I7d4590dc22902dade7a8f81bb1a8321b526a4925
2016-05-12 12:45:29 -04:00
Chih-hung Hsieh
51bec5a191
Merge "Fix google-explicit-constructor warnings."
2016-05-12 16:36:34 +00:00
Philip P. Moltmann
227b8aa6f2
Merge "Handle failure to create file." into nyc-dev
...
am: 808f2c361a
* commit '808f2c361af328aad8d69a02779c37f08f1fa32d':
Handle failure to create file.
Change-Id: I12b7b03e36c4160c5a93e5a72a3395616a44809e
2016-05-12 16:23:39 +00:00
Philip P. Moltmann
808f2c361a
Merge "Handle failure to create file." into nyc-dev
2016-05-12 16:16:40 +00:00
Phil Weaver
27e54131fa
Merge "Fix a race in settings update." into nyc-dev
...
am: df15e03ed0
* commit 'df15e03ed062493b506f7599ff1e6aff26828485':
Fix a race in settings update.
Change-Id: I6b51cb006e3b729ae8e0bd1060b41eb0ca1bdd68
2016-05-12 15:51:05 +00:00
Phil Weaver
df15e03ed0
Merge "Fix a race in settings update." into nyc-dev
2016-05-12 15:43:08 +00:00
Julia Reynolds
5ca04056aa
Merge "Logging for QS settings launch." into nyc-dev
...
am: 407c4343b2
* commit '407c4343b2dde2a2f9ac918a5fd2232f621d8ac4':
Logging for QS settings launch.
Change-Id: Ib9918e3279696daf6213cf55df65e10d4ca77a9e
2016-05-12 15:37:56 +00:00
Julia Reynolds
8f3e66f2fe
Logging for QS settings launch.
...
Change-Id: Iff8bbb448454c8a82196d292a285827846b28357
Fixes: 28678032
2016-05-12 10:33:47 -04:00
TreeHugger Robot
6cfe884637
Merge "sysui: refactor for extension."
2016-05-12 03:13:18 +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
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
Muyuan Li
b40004b44e
sysui: refactor for extension.
...
Make addTile in QSPanel return a TileRecord.
Bug: 28532600
Change-Id: I007d2f9caba410a8c9108e773822a467745b951c
(cherry picked from commit 63a18b4082f0ad9f8696f6a8a370a9df6210eebc)
2016-05-12 01:57:20 +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
Selim Cinek
d825dd5ba9
Merge "Fixed a bug where the QS was animating wrong when closing" into nyc-dev am: d6ee33e840
...
am: 563085539c
* commit '563085539cee9a702f8d1c3586dd2ec384562b9b':
Fixed a bug where the QS was animating wrong when closing
Change-Id: Id987540c093a2ad0b0d20c5621d7310122d723c3
2016-05-12 01:35:17 +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
Selim Cinek
563085539c
Merge "Fixed a bug where the QS was animating wrong when closing" into nyc-dev
...
am: d6ee33e840
* commit 'd6ee33e84069846b0907948f8972978c30b34a3c':
Fixed a bug where the QS was animating wrong when closing
Change-Id: I9147fbee9d8acb25700b50a2688c565c8c097f4c
2016-05-12 01:32:41 +00:00
Selim Cinek
bab8f09e9c
Merge "Fixed a bug where the QS was animating wrong when closing" into nyc-dev
...
am: d6ee33e840
* commit 'd6ee33e84069846b0907948f8972978c30b34a3c':
Fixed a bug where the QS was animating wrong when closing
Change-Id: I1c147f4f4ebf693ff218bd2b2fa1a3b890fe7c37
2016-05-12 01:32:39 +00:00
Selim Cinek
d6ee33e840
Merge "Fixed a bug where the QS was animating wrong when closing" into nyc-dev
2016-05-12 01:27:53 +00:00
Philip P. Moltmann
e05a7b71c6
Handle failure to create file.
...
This should never happen unless you disable the DocumentsUI app. Hence
handle it by a simple toast.
Bug: 28709934
Change-Id: Iac4aff32617120c442e0f994a2a8c0ce3cca380d
2016-05-11 15:04:17 -07:00
Android Build Merger (Role)
3a94a45235
Merge "Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev am: f7a2afb4fc am: 63e3e038c4 am: 6760c985e3"
2016-05-11 21:42:18 +00:00
Sudheer Shanka
9886239b47
Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev am: f7a2afb4fc am: 63e3e038c4
...
am: 6760c985e3
* commit '6760c985e3312f053e1df73c0fdb572608b3400a':
Move spinner_dropdown_restricted_item to Settings.
Change-Id: Ib1ed8d91b9d45d130c1c29d89fc6412c2c50171b
2016-05-11 21:26:07 +00:00
Jiaquan He
8d89b1dfe6
Merge "Set mStatusBarState in NotificationPanelView protected."
2016-05-11 20:47:35 +00:00
Jiaquan He
4e4ea47156
Merge "Move the user account querying logic to UserInfoController."
2016-05-11 20:47:24 +00:00
TreeHugger Robot
22141b7f43
Merge "sysui: refactor for extensibility."
2016-05-11 19:43:14 +00:00
TreeHugger Robot
ff2a83a15f
Merge "sysui: fix indicator direction."
2016-05-11 19:35:27 +00:00
Jiaquan He
e1206377de
Move the user account querying logic to UserInfoController.
...
Bug: 28383751
Change-Id: I85985d772b6aa9bfeb4e900854c9150481bddf7a
(cherry picked from commit ad4889c3c70ed042c24eac80f0f304ba67962dc3)
2016-05-11 19:27:16 +00:00
Jiaquan He
92bce83443
Set mStatusBarState in NotificationPanelView protected.
...
Change-Id: I0a8f0070a71b647923e2521ba7bbcaddd9b8e402
(cherry picked from commit 7a8aef9a33819983c2bec821984cc396b813c44a)
2016-05-11 19:26:15 +00:00
Sudheer Shanka
6760c985e3
Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev am: f7a2afb4fc
...
am: 63e3e038c4
* commit '63e3e038c4ba6e91c508262b705ec7562ec6cd63':
Move spinner_dropdown_restricted_item to Settings.
Change-Id: I1c982e16203dd6b76eeb5b60c49da911fabc9b73
2016-05-11 19:20:21 +00:00
Sudheer Shanka
63e3e038c4
Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev
...
am: f7a2afb4fc
* commit 'f7a2afb4fce896f82ee9468825af51efb6cf7c05':
Move spinner_dropdown_restricted_item to Settings.
Change-Id: Iba68fd936e04ef4c736b7ab77dd3d6d8bd8810a7
2016-05-11 19:12:38 +00:00
Sudheer Shanka
24d8e86219
Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev
...
am: f7a2afb4fc
* commit 'f7a2afb4fce896f82ee9468825af51efb6cf7c05':
Move spinner_dropdown_restricted_item to Settings.
Change-Id: I02b5a790cb4017173c57a33f07a8c37040a38ab5
2016-05-11 19:12:28 +00:00