Steve McKay
ae267cedce
Merge \\"Include an app icon.\\" into nyc-mr1-dev am: 3d8c9981b5
...
am: a8387db55e
2016-07-16 00:12:53 +00:00
Steve McKay
a8387db55e
Merge \"Include an app icon.\" into nyc-mr1-dev
...
am: 3d8c9981b5
2016-07-16 00:06:10 +00:00
TreeHugger Robot
3d8c9981b5
Merge "Include an app icon." into nyc-mr1-dev
2016-07-15 23:59:46 +00:00
Jeff Sharkey
8dd615fd07
Merge \"Merge \\"Build both filename views before deleting.\\" into nyc-mr1-dev am: fff6a11438\" into nyc-mr1-dev-plus-aosp
...
am: 40a4bf7dc1
2016-07-15 23:37:29 +00:00
Adrian Roos
7d7affe313
Merge \\"Doze: Add config for fine grained proximity checks\\" into nyc-mr1-dev am: 4ba23f30b5
...
am: e0cac111db
2016-07-15 23:25:31 +00:00
Adrian Roos
5810a1c252
Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am: 9a7c3bd577
...
am: 119840eb91
2016-07-15 23:25:19 +00:00
Jeff Sharkey
ab062fc81f
Merge \"Build both filename views before deleting.\" into nyc-mr1-dev
...
am: fff6a11438
2016-07-15 23:16:35 +00:00
Jason Monk
82307574a8
Merge \\"Reduce contention of ApplicationsState locks\\" into nyc-mr1-dev am: 9e133205e3
...
am: b3bbcf256f
2016-07-15 23:13:56 +00:00
Fan Zhang
a519938250
Merge "resolve merge conflicts of b9d34b3 to master"
2016-07-15 23:06:25 +00:00
TreeHugger Robot
fff6a11438
Merge "Build both filename views before deleting." into nyc-mr1-dev
2016-07-15 23:05:15 +00:00
Ben Lin
ea70d8d0d0
Merge "Fix a crash happening on a context menu."
2016-07-15 22:56:44 +00:00
Steve McKay
f00c161a22
Include an app icon.
...
Bug: 29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853
2016-07-15 15:37:14 -07:00
Jeff Sharkey
c50875e42e
Build both filename views before deleting.
...
Otherwise we'll throw when trying to create the second (visible)
filename because we just deleted it.
Bug: 30087518
Change-Id: I940a8f81c264fc17d477fadf46fd48eae29f2f6f
2016-07-15 15:34:44 -06:00
Fan Zhang
f04fe0489f
resolve merge conflicts of b9d34b3 to master
...
Change-Id: Id88ecf373378f9ed7c18a3d2d84ab419dd033891
2016-07-15 14:21:47 -07:00
Adrian Roos
e0cac111db
Merge \"Doze: Add config for fine grained proximity checks\" into nyc-mr1-dev
...
am: 4ba23f30b5
2016-07-15 21:16:49 +00:00
Adrian Roos
119840eb91
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
...
am: 9a7c3bd577
2016-07-15 21:16:36 +00:00
Adrian Roos
4ba23f30b5
Merge "Doze: Add config for fine grained proximity checks" into nyc-mr1-dev
2016-07-15 21:09:51 +00:00
TreeHugger Robot
9a7c3bd577
Merge "Add way to set live wallpaper across users" into nyc-mr1-dev
2016-07-15 21:07:31 +00:00
TreeHugger Robot
1fa74491cc
Merge "Remove vestigial config setting."
2016-07-15 20:42:17 +00:00
Jason Monk
b55c3c60a8
Merge \\"QS: Don\\'t use ComponentName to identify tiles\\" into nyc-mr1-dev am: a0967ebbdf
...
am: 356d4914b2
2016-07-15 20:16:44 +00:00
Esteban Talavera
be2612f415
Merge \\"Disallow user to block notification from OobConfig\\" into nyc-mr1-dev am: 28763c5a77
...
am: 65aeef9d87
2016-07-15 20:16:39 +00:00
Jason Monk
4acd59baf9
Merge "resolve merge conflicts of 4481b51 to master"
2016-07-15 20:08:41 +00:00
Jason Monk
b3bbcf256f
Merge \"Reduce contention of ApplicationsState locks\" into nyc-mr1-dev
...
am: 9e133205e3
2016-07-15 19:55:45 +00:00
TreeHugger Robot
9e133205e3
Merge "Reduce contention of ApplicationsState locks" into nyc-mr1-dev
2016-07-15 19:52:09 +00:00
Steve McKay
1d389a543e
Remove vestigial config setting.
...
Change-Id: I8cd1558ae76833d4f0e511f05fc6e66d9ff44a7e
2016-07-15 19:22:58 +00:00
Kevin Hufnagle
b9d34b3877
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608
...
am: 7703ce2d21
2016-07-15 19:12:28 +00:00
Adam Lesinski
8fc5bfd47c
Merge "Build SystemUI and Keyguard with AAPT2"
2016-07-15 19:06:11 +00:00
Adrian Roos
40ea083b59
Add way to set live wallpaper across users
...
Also adds an entry point for vendor specific services
to SystemUI.
Bug: 30038484
Change-Id: I8f335c1f7de15d619f2c688a8ac95372f166595f
2016-07-15 11:20:36 -07:00
Ben Lin
2e7234ce1d
Fix a crash happening on a context menu.
...
When an activity gets a callback for onContextItemSelected, it first
gets dibs on handling it, and then it propagates the call to -every-
fragment it is tied to. This poses a problem since RootsFragment and
DirectoryFragment don't necessarily handle each other's menu items well,
which can cause NPEs. This is some temporary fix for it.
Bug: 30092676
Change-Id: I3f268c9c9580504b78581ad92a24c9a99c4a0daf
(cherry picked from commit 3e1699f3a3f3d0378d758e3b0d430165867eb89e)
2016-07-15 18:17:57 +00:00
Jason Monk
e8ff0da78c
Reduce contention of ApplicationsState locks
...
Change-Id: I5b2ad52b014eea5bdf77526554eb10f4ba303105
Fixes: 30113789
2016-07-15 13:54:42 -04:00
Fan Zhang
3bfda445f7
Align empty views for quicksetting center in detail panel.
...
Change-Id: I6d0f1eaeee1ea59890cf0589381332a3f3a8fb4e
Fixes: 29981651
2016-07-15 10:45:22 -07:00
Jason Monk
356d4914b2
Merge \"QS: Don\'t use ComponentName to identify tiles\" into nyc-mr1-dev
...
am: a0967ebbdf
2016-07-15 17:03:46 +00:00
Jason Monk
a0967ebbdf
Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev
2016-07-15 16:55:23 +00:00
Jason Monk
d6ed970c4a
resolve merge conflicts of 4481b51 to master
...
Change-Id: I97489764bfe30507120b65e5e996aa4409435488
2016-07-15 12:32:33 -04:00
Tony Mak
65aeef9d87
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
...
am: 28763c5a77
2016-07-15 16:20:45 +00:00
Esteban Talavera
28763c5a77
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
2016-07-15 16:14:22 +00:00
Jason Monk
4481b51667
Merge \"QS Detail: Don\'t animate switch before panel open\" into nyc-mr1-dev
...
am: 9716690e2f
2016-07-15 16:12:00 +00:00
Jason Monk
48e093e6df
QS Detail: Don't animate switch before panel open
...
This will make it more obvious that wifi gets turned on by opening
the panel as the animation of the state change will be visible.
Change-Id: I6ceb0bef914a9ff368b1bdb750d19aeb43593e78
Fixes: 29057528
2016-07-15 10:40:44 -04:00
TreeHugger Robot
977a2b0e92
Merge "Addition UserInputHandler test coverage."
2016-07-15 03:35:50 +00:00
Chris Tate
5d43aee53d
Merge \\"Test existence of wallpaper files before backing them up\\" into nyc-mr1-dev am: 8b08553e90
...
am: 4a74ffc1b5
2016-07-15 01:57:59 +00:00
Selim Cinek
e5201f3419
Merge \\"Fixed a bug where the burmese clock could overlap\\" into nyc-mr1-dev am: f25486f8a5
...
am: a8c8cf5314
2016-07-15 01:57:57 +00:00
Christopher Tate
4a74ffc1b5
Merge \"Test existence of wallpaper files before backing them up\" into nyc-mr1-dev
...
am: 8b08553e90
2016-07-15 01:49:19 +00:00
Selim Cinek
a8c8cf5314
Merge \"Fixed a bug where the burmese clock could overlap\" into nyc-mr1-dev
...
am: f25486f8a5
2016-07-15 01:49:11 +00:00
Chris Tate
8b08553e90
Merge "Test existence of wallpaper files before backing them up" into nyc-mr1-dev
2016-07-15 01:36:48 +00:00
TreeHugger Robot
f25486f8a5
Merge "Fixed a bug where the burmese clock could overlap" into nyc-mr1-dev
2016-07-15 01:33:33 +00:00
Steve McKay
07886170d5
Addition UserInputHandler test coverage.
...
Pull event handling logic out of MultiSelectManager into UserInputHandler.
Pull out a couple common test support classes.
Change-Id: I8958fec9cda05f52192a07a682c318e049871a8d
2016-07-15 01:28:04 +00:00
Selim Cinek
bce45cdd46
Merge \\"Fixed the heads up disspearing bug for real\\" into nyc-mr1-dev am: 70b06cc62f
...
am: 58526c8391
2016-07-15 00:19:25 +00:00
Selim Cinek
58526c8391
Merge \"Fixed the heads up disspearing bug for real\" into nyc-mr1-dev
...
am: 70b06cc62f
2016-07-15 00:13:48 +00:00
TreeHugger Robot
70b06cc62f
Merge "Fixed the heads up disspearing bug for real" into nyc-mr1-dev
2016-07-15 00:09:47 +00:00
Jim Miller
a5910a9cd5
Merge \\"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\\" into nyc-mr1-dev am: 538b836e05
...
am: ba350f3512
2016-07-14 23:55:37 +00:00
