Guang Zhu
a60e72ae2c
am 53b3bb07: Merge "clean up Process instance after we are done with the sub process" into mnc-dev
...
* commit '53b3bb072bcebd6b7d89a6b06139f458e9240ae9':
clean up Process instance after we are done with the sub process
2015-06-09 00:33:50 +00:00
Jorim Jaggi
eed6e7a287
am 2d144063: Merge "Fix flickering in alarm detail transition" into mnc-dev
...
* commit '2d144063a696d249f6a2d75aed6ada544d22d13c':
Fix flickering in alarm detail transition
2015-06-09 00:33:46 +00:00
Jorim Jaggi
b02f8500e9
am 46ac19f3: Use better interpolator when clicking on QS header
...
* commit '46ac19f32c4a37eb9cf6777b041fb2fa40ba33e3':
Use better interpolator when clicking on QS header
2015-06-09 00:33:41 +00:00
Jorim Jaggi
c372c8210a
am 59ec304e: Don\'t invert legacy notifications
...
* commit '59ec304eaebf1bc4098d6feb6cca9039c8b70d3d':
Don't invert legacy notifications
2015-06-09 00:33:37 +00:00
Jorim Jaggi
085c8dd920
am 7b5e6c88: Merge "Only doze when not occluded" into mnc-dev
...
* commit '7b5e6c884dca09f670c471eebf86542c4aa173ad':
Only doze when not occluded
2015-06-09 00:33:32 +00:00
Guang Zhu
53b3bb072b
Merge "clean up Process instance after we are done with the sub process" into mnc-dev
2015-06-09 00:30:39 +00:00
Jorim Jaggi
2d144063a6
Merge "Fix flickering in alarm detail transition" into mnc-dev
2015-06-09 00:30:12 +00:00
Jorim Jaggi
2ba5979368
Fix flickering in alarm detail transition
...
Bug: 21400392
Change-Id: I28e4c0cbaa322d8711c5a84cd0ff7b409913b935
2015-06-08 17:29:33 -07:00
Jorim Jaggi
46ac19f32c
Use better interpolator when clicking on QS header
...
This interpolator feels nicer when the reason why it animates comes
from a touch.
Change-Id: Ie13466c092e9546f8a8c5fdca589b35f78cde88c
2015-06-09 00:23:18 +00:00
Jorim Jaggi
59ec304eae
Don't invert legacy notifications
...
Bug: 19130917
Change-Id: Id06fcf8fb11b783360a86534e024164b230e84a4
2015-06-09 00:20:51 +00:00
Jorim Jaggi
7b5e6c884d
Merge "Only doze when not occluded" into mnc-dev
2015-06-09 00:20:30 +00:00
Jorim Jaggi
88a0ee90c6
am 5cc86599: Dismiss Keyguard correctly
...
* commit '5cc86599ce0e5596655859d09c52934030da240b':
Dismiss Keyguard correctly
2015-06-09 00:16:06 +00:00
Zach Johnson
ea9f961ce2
am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev
...
* commit 'd56958c440dffd85349adee5ca0bf4d0893215c6':
Ignore carrier apps when checking for idleness
2015-06-09 00:16:01 +00:00
Selim Cinek
9a9c34d3d6
am 196597b7: Merge "Children which are removed when HUNd now animate out" into mnc-dev
...
* commit '196597b7c09fce62276099292bb0e3d0572fe4a5':
Children which are removed when HUNd now animate out
2015-06-09 00:11:13 +00:00
Jorim Jaggi
5cc86599ce
Dismiss Keyguard correctly
...
When authenticating with fingerprint, we didn't go through the
dismiss action, and thus launching intents was broken when
authenticating with fingerprint from the bouncer. Also fixed a crash.
Bug: 21695578
Change-Id: I61f74b5b63d4d6ddf7f8f3ce96feb63b9644cd52
2015-06-09 00:10:09 +00:00
Zach Johnson
d56958c440
Merge "Ignore carrier apps when checking for idleness" into mnc-dev
2015-06-09 00:06:29 +00:00
Jorim Jaggi
8396970065
Only doze when not occluded
...
This fixes a bug where an activity could have been started on top of
the lockscreen while dozing already. In that case, we would execute a
pulse and reveal the fully colored activity that is occluding the
Keyguard
Bug: 19465785
Change-Id: I9533390e13f11424a20a107005d60050a460e333
2015-06-09 00:02:55 +00:00
Selim Cinek
196597b7c0
Merge "Children which are removed when HUNd now animate out" into mnc-dev
2015-06-09 00:00:06 +00:00
Prerepa Viswanadham
c165e1d88c
am 8711ed64: Merge changes from topic \'modemActivityInfo\' into mnc-dev
...
* commit '8711ed644bab42c03ab9a22c14e1cb2825a107a6':
API for get modem activity info
Activity info and stats from modem
2015-06-08 23:57:57 +00:00
Prerepa Viswanadham
8711ed644b
Merge changes from topic 'modemActivityInfo' into mnc-dev
...
* changes:
API for get modem activity info
Activity info and stats from modem
2015-06-08 23:44:51 +00:00
Adam Lesinski
2ce589b1db
am 4cf59747: Merge "Bump the BatteryStats parcel VERSION" into mnc-dev
...
* commit '4cf59747f8e23b1d23ee7450541e34826dccbd4f':
Bump the BatteryStats parcel VERSION
2015-06-08 23:25:40 +00:00
Adam Lesinski
4cf59747f8
Merge "Bump the BatteryStats parcel VERSION" into mnc-dev
2015-06-08 23:14:17 +00:00
Dongwon Kang
fc5d76637c
am 0dd7ddc4: Merge "Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()" into mnc-dev
...
* commit '0dd7ddc414971732b962352c7ad4a8fb111272c4':
Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()
2015-06-08 23:05:49 +00:00
John Reck
6309b5f74c
am 62043203: Merge "Delete unused" into mnc-dev
...
* commit '62043203df362addaf1692657dde1993d88d9b52':
Delete unused
2015-06-08 23:05:44 +00:00
Dongwon Kang
0dd7ddc414
Merge "Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()" into mnc-dev
2015-06-08 22:58:56 +00:00
John Reck
62043203df
Merge "Delete unused" into mnc-dev
2015-06-08 22:51:43 +00:00
John Reck
4538ef2abc
Delete unused
...
Change-Id: If27e1eb8e42313eae14df58a24ca54fafb2992fa
2015-06-08 15:45:58 -07:00
Jonathan Basseri
3efdf81da0
am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev
...
* commit '623bf636de8f6f53ffa46127ed3fa5477be0a094':
Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
2015-06-08 22:35:38 +00:00
Jonathan Basseri
623bf636de
Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev
2015-06-08 22:27:34 +00:00
Filip Gruszczynski
3370b6c95e
am 5e4c382d: resolved conflicts for merge of 17ba2e6c to mnc-dev
...
* commit '5e4c382d15968c757fb9c5783cbd420156ea8ad2':
Calculate outsets before window frame adjustment.
2015-06-08 22:14:38 +00:00
Adam Lesinski
df6235cd76
Bump the BatteryStats parcel VERSION
...
A previous change forgot to bump the version, leading to
corrupt data.
Bug:19683715
Bug:21574065
Change-Id: I30c9039694b02d576909e8f60c25f175986b8c5c
2015-06-08 15:04:16 -07:00
Filip Gruszczynski
5e4c382d15
resolved conflicts for merge of 17ba2e6c to mnc-dev
...
Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0
2015-06-08 15:00:25 -07:00
Jonathan Basseri
5ea0c8f1c6
Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
...
Per discussion with API council, "notify" makes more sense than "reload"
here.
Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
2015-06-08 14:59:09 -07:00
Dongwon Kang
b0cf7ea65d
Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()
...
Bug: 21485727
Change-Id: I6b639464a3543dec4d7a248bdd8042b2c3872fac
2015-06-08 14:16:54 -07:00
John Spurlock
c2fbbcc797
am e37cf3b8: Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev
...
* commit 'e37cf3b8d614019c5570f945110bfbc5a8b09713':
QS: Handle font-size changes immediately in ZenModePanel.
2015-06-08 21:12:29 +00:00
Joseph Wen
970b9c2ac1
am d8ffe624: Merge "Update Statement Service." into mnc-dev
...
* commit 'd8ffe624b22a289b4f87af84acb05327b7818e53':
Update Statement Service.
2015-06-08 21:05:25 +00:00
Geoff Mendal
5911363fad
am 59b28c0c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '59b28c0c9cff7eda3974ae861c550c3d37af6412':
Import translations. DO NOT MERGE
2015-06-08 21:05:21 +00:00
John Spurlock
e37cf3b8d6
Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev
2015-06-08 21:03:57 +00:00
Joseph Wen
d8ffe624b2
Merge "Update Statement Service." into mnc-dev
2015-06-08 20:56:25 +00:00
Geoff Mendal
59b28c0c9c
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-08 20:53:03 +00:00
Zach Johnson
b4b9ca7580
Ignore carrier apps when checking for idleness
...
Also introduce a way to check if a package has
carrier privileges for any active phone.
Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
2015-06-08 13:49:13 -07:00
Etan Cohen
03609df355
am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev
...
* commit '7631697793a8b82bb2a1cd3adced1b140d266427':
Update documentation of CARRIER_PRESENCE & bitmasks.
2015-06-08 20:39:40 +00:00
Etan Cohen
7631697793
Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev
2015-06-08 20:29:14 +00:00
John Spurlock
d896323eab
QS: Handle font-size changes immediately in ZenModePanel.
...
And make sure the condition row is tall enough to accomodate
huge text.
Bug: 20346315
Change-Id: I9346f80edd7f0069d6363fe5377b36b0bf5aca62
2015-06-08 16:26:12 -04:00
Wale Ogunwale
549ac6925a
am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev
...
* commit 'd8b9b642feab52523ec6db7b170b08f1bc74b004':
Use DisplayAdjustments when creating display in ResourceManager
2015-06-08 20:21:25 +00:00
John Spurlock
50e98a33ec
am c0f7aff3: Merge "Zen QS: Use explicit content descriptions for zen buttons." into mnc-dev
...
* commit 'c0f7aff3df237e5990d8bff1b52e96cff17f745b':
Zen QS: Use explicit content descriptions for zen buttons.
2015-06-08 20:21:20 +00:00
keunyoung
b7ee0ba43b
am 7da9d7aa: Merge "apply force hiding of window only when it is main display" into mnc-dev
...
* commit '7da9d7aa52751434ee869ccd6a1e71d2a9b7f5cd':
apply force hiding of window only when it is main display
2015-06-08 20:21:15 +00:00
Wale Ogunwale
d8b9b642fe
Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev
2015-06-08 20:17:23 +00:00
Geoff Mendal
4ad2b0c829
Import translations. DO NOT MERGE
...
Change-Id: I45739d8c8ae447a724264c4946aedd273a308d91
Auto-generated-cl: translation import
2015-06-08 13:15:33 -07:00
John Spurlock
c0f7aff3df
Merge "Zen QS: Use explicit content descriptions for zen buttons." into mnc-dev
2015-06-08 20:13:09 +00:00