OSDN Git Service
Robert Carr [Thu, 9 Jun 2016 19:36:27 +0000 (19:36 +0000)]
Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
am:
4624d687f7
Change-Id: I94fc4de5fd24f75b2b69f6380048d8e57ae7980e
Philip P. Moltmann [Thu, 9 Jun 2016 19:31:57 +0000 (19:31 +0000)]
Merge \"Handling of Fuji Xerox in RecommendationService.\" into nyc-dev
am:
5398f2731b
Change-Id: I109284a897eba18ec57bd5f61cdade0fcde19a36
TreeHugger Robot [Thu, 9 Jun 2016 19:28:10 +0000 (19:28 +0000)]
Merge "PiP animation: Move window with resize when ending animation." into nyc-dev
Philip P. Moltmann [Thu, 9 Jun 2016 19:24:04 +0000 (19:24 +0000)]
Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev
Eric Schmidt [Thu, 9 Jun 2016 18:02:19 +0000 (18:02 +0000)]
Merge \\\"docs: Added links to performance resources section\\\" into mnc-io-docs am:
e4b1149320 am:
2dea7d3836
am:
b1a99c46b6
Change-Id: I97b35a9519074face9851550b6e6c18300145624
Eric Schmidt [Thu, 9 Jun 2016 17:56:38 +0000 (17:56 +0000)]
Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am:
e4b1149320
am:
2dea7d3836
Change-Id: I73d48da51be02656ae636686b42253c35ebc3762
Eric Schmidt [Thu, 9 Jun 2016 17:45:53 +0000 (17:45 +0000)]
Merge \"docs: Added links to performance resources section\" into mnc-io-docs
am:
e4b1149320
Change-Id: Ib1fa097035dce4d6e4c55ac6d87aa26bacceade8
Eric Schmidt [Thu, 9 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "docs: Added links to performance resources section" into mnc-io-docs
Robert Carr [Fri, 3 Jun 2016 20:28:48 +0000 (13:28 -0700)]
PiP animation: Move window with resize when ending animation.
At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.
Bug:
28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
Aurimas Liutikas [Thu, 9 Jun 2016 17:09:26 +0000 (17:09 +0000)]
Merge \\\"Correct the size of example bitmap for xxhdpi.\\\" into mnc-io-docs am:
396ed8d2cf am:
6e70538600
am:
e82ac10fa2
Change-Id: I984489411a4aceb62c495f861f18c130699ffe62
Aurimas Liutikas [Thu, 9 Jun 2016 17:09:14 +0000 (17:09 +0000)]
Merge \\\"Remove duplicate the from AppBar documentation.\\\" into mnc-io-docs am:
f9f7a29fe9 am:
9bd21c0fbb
am:
9ac187304b
Change-Id: I5d1a08a1c8b69409fb5e7350582868f9cf383902
Aurimas Liutikas [Thu, 9 Jun 2016 17:09:05 +0000 (17:09 +0000)]
Merge \\\"Fix code example in testing-support-library.\\\" into mnc-io-docs am:
e172a4b692 am:
5b8233126d
am:
248eb25863
Change-Id: I28e1c06db8f2095dd2d8f05effac4fe2c7f4f974
Aurimas Liutikas [Thu, 9 Jun 2016 17:08:58 +0000 (17:08 +0000)]
Merge \\\"Fix a link to CustomTabsCallback in support-library docs.\\\" into mnc-io-docs am:
2ff2814a4a am:
5d75a24896
am:
d8b2c49475
Change-Id: I56ddae17078815ead1812bf598665e0f5c4ecc88
Aurimas Liutikas [Thu, 9 Jun 2016 16:57:02 +0000 (16:57 +0000)]
Merge \\"Correct the size of example bitmap for xxhdpi.\\" into mnc-io-docs am:
396ed8d2cf
am:
6e70538600
Change-Id: I0714693f2f19107d056be72944343c9636a0ff7e
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:58 +0000 (16:56 +0000)]
Merge \\"Remove duplicate the from AppBar documentation.\\" into mnc-io-docs am:
f9f7a29fe9
am:
9bd21c0fbb
Change-Id: Ib9c0255b772b0fc47d46758abdace1cf6bc9b045
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:54 +0000 (16:56 +0000)]
Merge \\"Fix code example in testing-support-library.\\" into mnc-io-docs am:
e172a4b692
am:
5b8233126d
Change-Id: Iee54ea9150f67b2595df3919ee06d307778d6666
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:50 +0000 (16:56 +0000)]
Merge \\"Fix a link to CustomTabsCallback in support-library docs.\\" into mnc-io-docs am:
2ff2814a4a
am:
5d75a24896
Change-Id: Iaa7fa74ba79eb4b6ea2bdc8274ab1498cb6b79f5
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:15 +0000 (16:45 +0000)]
Merge \"Correct the size of example bitmap for xxhdpi.\" into mnc-io-docs
am:
396ed8d2cf
Change-Id: Idb10cf41ebddc99613fcac41e9b6367c6e6b9e46
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:13 +0000 (16:45 +0000)]
Merge \"Remove duplicate the from AppBar documentation.\" into mnc-io-docs
am:
f9f7a29fe9
Change-Id: I7c79f4df131bbb7f2f5189af901cd75ac240c194
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:12 +0000 (16:45 +0000)]
Merge \"Fix code example in testing-support-library.\" into mnc-io-docs
am:
e172a4b692
Change-Id: I47e39e2a19289d12d1d54000c974ef9c1c97839a
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:10 +0000 (16:45 +0000)]
Merge \"Fix a link to CustomTabsCallback in support-library docs.\" into mnc-io-docs
am:
2ff2814a4a
Change-Id: Ic1b3b40336bc22503ac86aea96bd98b705adf96d
Aurimas Liutikas [Thu, 9 Jun 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Correct the size of example bitmap for xxhdpi." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:41:54 +0000 (16:41 +0000)]
Merge "Remove duplicate the from AppBar documentation." into mnc-io-docs
Philip P. Moltmann [Thu, 9 Jun 2016 16:39:55 +0000 (09:39 -0700)]
Handling of Fuji Xerox in RecommendationService.
- Display name
- Fix exclusion of Fuji from Xerox plugin
Bug:
28908572
Change-Id: I00c235a4eb09a681717eb3be65d586246a069f4b
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:25 +0000 (16:39 +0000)]
Merge "Fix code example in testing-support-library." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:14 +0000 (16:39 +0000)]
Merge "Fix a link to CustomTabsCallback in support-library docs." into mnc-io-docs
Jason Monk [Thu, 9 Jun 2016 15:33:41 +0000 (15:33 +0000)]
Merge \"QS: Fix crash when removing pages in RTL\" into nyc-dev
am:
9b5a780722
Change-Id: I81df6680e203af32d5cead8ab9340aff2a6fcaba
Xiaohui Chen [Thu, 9 Jun 2016 15:33:28 +0000 (15:33 +0000)]
Merge \"QS Detail: Fix up open/close animations\" into nyc-dev
am:
ac2e291832
Change-Id: I1ac6fae02a4946ca83fd466b815ec4788399d4d0
Jason Monk [Thu, 9 Jun 2016 15:25:00 +0000 (15:25 +0000)]
Merge "QS: Fix crash when removing pages in RTL" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 15:22:48 +0000 (15:22 +0000)]
Merge "QS Detail: Fix up open/close animations" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 14:22:05 +0000 (14:22 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
972b902171 -s ours
Change-Id: Ibcecebeb1286ecbc1529b428028a75c5b01de436
TreeHugger Robot [Thu, 9 Jun 2016 14:15:24 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 13:59:56 +0000 (09:59 -0400)]
QS: Fix crash when removing pages in RTL
Change-Id: Ic8f082a3dc61fbf12f576d4cffb8ab31e669cb7c
Fixes:
29122756
Bill Yi [Thu, 9 Jun 2016 13:57:15 +0000 (13:57 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
648c1112a6 -s ours
Change-Id: I495ab1285df32ffdbc39a03b6c2d94ccb8271622
TreeHugger Robot [Thu, 9 Jun 2016 13:51:09 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 12:39:26 +0000 (05:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: If53965a4f42f4c97334fc88250af6a72a9658b8a
Auto-generated-cl: translation import
Narayan Kamath [Thu, 9 Jun 2016 08:34:30 +0000 (08:34 +0000)]
PackageManagerService: fix NPE while renaming foreign dex markers.
am:
cf70a17a71
Change-Id: I565e13f9b6c74f3cbf0467527920549d2614d10d
Narayan Kamath [Tue, 7 Jun 2016 08:31:55 +0000 (09:31 +0100)]
PackageManagerService: fix NPE while renaming foreign dex markers.
The User passed in to scan*LI is null during the initial boot scan
and maybeRenameForeignDexMarkers wasn't expecting it. We attempt to
rename markers for all users if that happens.
bug:
29167406
Change-Id: I892dcc542e75d62d72c062b8ce5506ef85df5fc2
Chad Brubaker [Thu, 9 Jun 2016 06:27:57 +0000 (06:27 +0000)]
Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am:
55cf361d83
Change-Id: If30e7300c84a79871dc8a0288f8402ed49e4a662
TreeHugger Robot [Thu, 9 Jun 2016 06:22:19 +0000 (06:22 +0000)]
Merge "Don't depend directly on AppplicationInfo" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 05:27:34 +0000 (22:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3234ff4e69fbcc40de1d78539fcc886957b5dce5
Auto-generated-cl: translation import
David Sehr [Thu, 9 Jun 2016 05:26:42 +0000 (05:26 +0000)]
Merge \"Simplify code paths computation, allow adb root to dump\" into nyc-dev
am:
1c4da6654f
Change-Id: I6c433663b5b3330f34a731ab32f15b5964649098
David Sehr [Thu, 9 Jun 2016 05:20:19 +0000 (05:20 +0000)]
Merge "Simplify code paths computation, allow adb root to dump" into nyc-dev
Chad Brubaker [Wed, 8 Jun 2016 19:57:46 +0000 (12:57 -0700)]
Don't depend directly on AppplicationInfo
ApplicationInfo is mutable and unfortunately some apps do actually
modify the flags. Due to the lazy loading nature of the network security
config this may lead to issues. Instead cache the needed flags and
resources at application startup.
Bug:
29063413
(cherry picked from commit
276ee969be89ba25e439839341953236adf80c40)
Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c
Adam Lesinski [Thu, 9 Jun 2016 03:53:13 +0000 (03:53 +0000)]
Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am:
0d25fdd4a8
Change-Id: Iac56b8b134244013730317adf2b417cef402fd09
Erik Wolsheimer [Thu, 9 Jun 2016 03:49:07 +0000 (03:49 +0000)]
Merge \\\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\\" into cw-e-dev am:
eae242cfe8 -s ours am:
8b04b0db2e -s ours
am:
24d94b8aa0 -s ours
Change-Id: I152d9a8edbb7ac9f7e8589afaf8f154352bfe563
TreeHugger Robot [Thu, 9 Jun 2016 03:45:19 +0000 (03:45 +0000)]
Merge "Throw proper exception in ResourcesManager" into nyc-dev
Erik Wolsheimer [Thu, 9 Jun 2016 03:42:27 +0000 (03:42 +0000)]
Merge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into cw-e-dev am:
eae242cfe8 -s ours
am:
8b04b0db2e -s ours
Change-Id: I459eec39aa68d4e165264189ce051bc8b4253965
Erik Wolsheimer [Thu, 9 Jun 2016 03:37:02 +0000 (03:37 +0000)]
Merge \"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\" into cw-e-dev
am:
eae242cfe8 -s ours
Change-Id: Ia418392bcbab16d2c02689fdc79138b1cee304ab
Erik Wolsheimer [Thu, 9 Jun 2016 03:25:42 +0000 (03:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
fionaxu [Thu, 9 Jun 2016 02:44:19 +0000 (02:44 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours am:
2d03c0f956 am:
dc9a7c7b23 am:
e892848035 am:
7e2c6c3440 -s ours
am:
9f0a266df9
Change-Id: I6eb221adb67365c04538d03937aa349235b98f12
fionaxu [Thu, 9 Jun 2016 02:39:52 +0000 (02:39 +0000)]
Merge \"resolve merge conflicts of
afed6f8 to nyc-dev\" into nyc-dev
am:
0c4f1c7e5c
Change-Id: I2d17de5bc787f4f9c8b7a9115a635bfee820a219
fionaxu [Thu, 9 Jun 2016 02:39:15 +0000 (02:39 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours am:
2d03c0f956 am:
dc9a7c7b23 am:
e892848035
am:
7e2c6c3440 -s ours
Change-Id: Ic463b8a7a1a1ea537f1fea4fd36dd176464ac789
sreevanis [Thu, 9 Jun 2016 02:35:51 +0000 (02:35 +0000)]
Merge \\\"docs: Documented how to handle alarms in AA media apps.\\\" into mnc-io-docs am:
21d6abf7be am:
539b6b7580
am:
e8ebd8aea0
Change-Id: I3deec748799b7f2561f64ce6692ec7e84ec13a6f
Chen Xu [Thu, 9 Jun 2016 02:32:51 +0000 (02:32 +0000)]
Merge "resolve merge conflicts of
afed6f8 to nyc-dev" into nyc-dev
Sreevani Sreejith [Thu, 9 Jun 2016 02:28:58 +0000 (02:28 +0000)]
Merge \\"docs: Documented how to handle alarms in AA media apps.\\" into mnc-io-docs am:
21d6abf7be
am:
539b6b7580
Change-Id: I92cd1c4193e9e8920f28f3300d28bdc8bb6b04cd
sreevanis [Thu, 9 Jun 2016 02:23:30 +0000 (02:23 +0000)]
Merge \"docs: Documented how to handle alarms in AA media apps.\" into mnc-io-docs
am:
21d6abf7be
Change-Id: Id05d99983414d3884c0c90fb67eec224ca77c80b
Sreevani Sreejith [Thu, 9 Jun 2016 02:15:38 +0000 (02:15 +0000)]
Merge "docs: Documented how to handle alarms in AA media apps." into mnc-io-docs
sreevanis [Fri, 3 Jun 2016 19:43:52 +0000 (12:43 -0700)]
docs: Documented how to handle alarms in AA media apps.
Bug:
27708785
Change-Id: Iee2a676fd8adbcba00301932d5e5637ee21df224
Jim Miller [Thu, 9 Jun 2016 01:41:27 +0000 (01:41 +0000)]
Merge \"Always re-enable keyguard state when the user switches.\" into nyc-dev
am:
9e94c455f8
Change-Id: I0af4431f59e586a9daf0107b0379d5e44eab1549
TreeHugger Robot [Thu, 9 Jun 2016 01:38:31 +0000 (01:38 +0000)]
Merge "Always re-enable keyguard state when the user switches." into nyc-dev
Jim Miller [Thu, 9 Jun 2016 00:34:25 +0000 (00:34 +0000)]
Merge \"Revert \"Temporarily increase timeout for devices with buggy driver\"\" into nyc-dev
am:
e36da9c8c9
Change-Id: I442bcdfc4664d41638ae95ef0bd0098f4111c301
TreeHugger Robot [Thu, 9 Jun 2016 00:28:52 +0000 (00:28 +0000)]
Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev
Winson [Thu, 9 Jun 2016 00:27:19 +0000 (00:27 +0000)]
Forcing software in header button background ripples.
am:
18227e4831
Change-Id: I2007e888534cc58a25106e908497366d0dd72308
Adam Lesinski [Thu, 9 Jun 2016 00:19:09 +0000 (17:19 -0700)]
Throw proper exception in ResourcesManager
In M we would bubble up a NameNotFoundException when failing
to load an assetmanager from another application. We switched
to throwing an IllegalArgumentException, which isn't something
anyone should handle.
This change has ResourcesManager throw Resources.NotFoundException,
which callers like ApplicationPackageManager can catch and rethrow
with the appropriate checked exception. This adds more detail to
errors than we had in M.
Bug:
28876344
Change-Id: I250aeef8a4ccfd90c6abef2243edc1c5337ebde9
fionaxu [Wed, 8 Jun 2016 23:05:56 +0000 (16:05 -0700)]
resolve merge conflicts of
afed6f8 to nyc-dev
Bug:
28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
Winson [Wed, 8 Jun 2016 19:57:40 +0000 (12:57 -0700)]
Forcing software in header button background ripples.
Bug:
29133575
Change-Id: I21125e28208335f5b2c2adf06cb1c8199b3ca476
Adam Lesinski [Wed, 8 Jun 2016 22:55:33 +0000 (22:55 +0000)]
Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
am:
e5417a3863
Change-Id: I67f604fbacba0efb95ff01b2de5bd7799eb8c3d9
TreeHugger Robot [Wed, 8 Jun 2016 22:49:23 +0000 (22:49 +0000)]
Merge "Consume the first sample of KernelUidCpuTimeReader" into nyc-dev
Eric Schmidt [Tue, 31 May 2016 20:26:25 +0000 (13:26 -0700)]
docs: Added links to performance resources section
Bug:
27925680
Change-Id: Ide169d8f1b182cb1ed0021c35f2eee51feac71d7
Svet Ganov [Wed, 8 Jun 2016 21:59:02 +0000 (21:59 +0000)]
Merge \"Teach persistable Uri grants about direct boot\" into nyc-dev
am:
7014eef54a
Change-Id: I8b4d95a7128829de62f3eb795dc275c373890be5
Svetoslav Ganov [Wed, 8 Jun 2016 21:54:39 +0000 (21:54 +0000)]
Merge "Teach persistable Uri grants about direct boot" into nyc-dev
Adarsh Fernando [Wed, 8 Jun 2016 21:21:01 +0000 (21:21 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am:
c65f7e8071 am:
28f355bb63
am:
fe089e3dc5
Change-Id: I2fdf01f795c0bc9b25a8963b73a67b8947bf7c8b
Adam Lesinski [Wed, 8 Jun 2016 21:19:09 +0000 (14:19 -0700)]
Consume the first sample of KernelUidCpuTimeReader
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.
Bug:
29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
Adarsh Fernando [Wed, 8 Jun 2016 21:18:02 +0000 (21:18 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am:
c65f7e8071
am:
28f355bb63
Change-Id: I5efe04ef8a2c7c3d7a226ee91beca0f89e48be37
Adarsh Fernando [Wed, 8 Jun 2016 21:12:56 +0000 (21:12 +0000)]
AS UI redirect for experimental to stable Gradle migration guide
am:
c65f7e8071
Change-Id: I6ebb598650756de2687b4ab73ef41e27b13c8b1c
Adarsh Fernando [Wed, 8 Jun 2016 20:42:37 +0000 (13:42 -0700)]
AS UI redirect for experimental to stable Gradle migration guide
- This guide may be moved over to DAC when AS 2.2 goes stable.
Change-Id: Ia29bb75832f01efc8175db45f8fd08d5013d715e
Adrian Roos [Wed, 8 Jun 2016 20:34:16 +0000 (20:34 +0000)]
Merge \"Direct Reply: Add back emoji button\" into nyc-dev
am:
3207d8f8a1
Change-Id: Ieb70c3d9bed1c63e24e0be0baf9b19a9f7e9e663
Adrian Roos [Wed, 8 Jun 2016 20:24:59 +0000 (20:24 +0000)]
Merge "Direct Reply: Add back emoji button" into nyc-dev
David Sehr [Wed, 8 Jun 2016 17:37:33 +0000 (10:37 -0700)]
Simplify code paths computation, allow adb root to dump
Bug:
28748264
Change-Id: I1aefa5d98e80b58d6ed500c5d2d610569cf25c3a
Adrian Roos [Fri, 3 Jun 2016 15:50:23 +0000 (08:50 -0700)]
Direct Reply: Add back emoji button
Bug:
29077108
Change-Id: Ibd1423465c5ec9aced4c4b77575a469f5e85f20d
Robert Carr [Wed, 8 Jun 2016 20:13:18 +0000 (20:13 +0000)]
Merge \"Ensure pinned animation scaling is consistently applied.\" into nyc-dev
am:
b99e19c729
Change-Id: Ibe2acdd30d3354759df589c1bb312e50640cfc16
TreeHugger Robot [Wed, 8 Jun 2016 20:08:37 +0000 (20:08 +0000)]
Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev
Selim Cinek [Wed, 8 Jun 2016 19:45:13 +0000 (19:45 +0000)]
Merge changes I0ca13626,I3677ce54 into nyc-dev
am:
bbcb733d80
Change-Id: I1ab5db3410322ea9880ad4bce9b78b8355c0f2ce
Svet Ganov [Wed, 8 Jun 2016 16:40:47 +0000 (09:40 -0700)]
Teach persistable Uri grants about direct boot
We read the persistable Uri grants on boot at which point
the user is not unlocked. This results in ignoring Uri
grants for boot unaware content providers.
This change reads all persisted Uri grants on boot but
filters them out during query based on the current user
unlock state.
bug:
29058113
Change-Id: I2643fc098f42359e72a4c534236debc9b9389256
Selim Cinek [Wed, 8 Jun 2016 19:37:39 +0000 (19:37 +0000)]
Merge changes I0ca13626,I3677ce54 into nyc-dev
* changes:
Fixed a flicker when closing QS without notifications
Handled expandability and swiping while guts are exposed
Jason Monk [Wed, 8 Jun 2016 19:21:33 +0000 (19:21 +0000)]
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev
am:
fd6e7e6790
Change-Id: I0fbfd17114fbcf6c4552d5f192ce17722272a6c6
Jason Monk [Wed, 8 Jun 2016 19:21:29 +0000 (19:21 +0000)]
Merge \"QS: Fix leak in QSAnimator\" into nyc-dev
am:
883da638e2
Change-Id: I7e8f106c741a8fc1b920bad2ffd65331463e148b
Jason Monk [Wed, 8 Jun 2016 19:21:26 +0000 (19:21 +0000)]
Merge \"QS: Show date even on small screens\" into nyc-dev
am:
fbf366d7ee
Change-Id: I7650ec130e8bcf31b2924af96e8bb2c412111c17
Will Harmon [Wed, 8 Jun 2016 19:21:22 +0000 (19:21 +0000)]
Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
am:
4455fc734c
Change-Id: I391ada63a040537925d8b8a8151d0e6d49a6e69b
Jason Monk [Wed, 8 Jun 2016 19:15:34 +0000 (19:15 +0000)]
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
am:
27eadb6f1d
Change-Id: I6fd319a6bce9748db40ffc53849c68e2e8da5ad5
Jason Monk [Wed, 8 Jun 2016 19:12:19 +0000 (19:12 +0000)]
Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:12:05 +0000 (19:12 +0000)]
Merge "QS: Fix leak in QSAnimator" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:40 +0000 (19:11 +0000)]
Merge "QS: Show date even on small screens" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:15 +0000 (19:11 +0000)]
Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev
Will Harmon [Mon, 6 Jun 2016 19:54:59 +0000 (12:54 -0700)]
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.
Fixes:
28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Settings: Better handling for disabled tiles" into nyc-dev
fionaxu [Wed, 8 Jun 2016 18:41:33 +0000 (18:41 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours am:
2d03c0f956 am:
dc9a7c7b23
am:
e892848035
Change-Id: Ic74c9116d505f3f76dd659d7bfd60ded6463f0ed
Alan Viverette [Wed, 8 Jun 2016 18:35:22 +0000 (18:35 +0000)]
Merge \"Return correct default theme on API >= 24\" into nyc-dev
am:
afaa1e9db1
Change-Id: I620b5682bc4fa9752b1f1bf68d8ed1498db66a5d
fionaxu [Wed, 8 Jun 2016 18:33:22 +0000 (18:33 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours am:
2d03c0f956
am:
dc9a7c7b23
Change-Id: I0cccd4ba128987959aa0e9324c1f5ab5bb5bc455