Commit Graph

325848 Commits

Author SHA1 Message Date
Adrian Roos
fcaf2d1ae9 Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a
am: b42e50a3a0

Change-Id: I1ca543cb1b23221adf96a7d09a152fea4461b8f5
2017-06-08 00:08:22 +00:00
Adrian Roos
b42e50a3a0 Merge "Keyguard: Increase clock size" into oc-dev
am: 2ff366a39a

Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d
2017-06-08 00:00:25 +00:00
Adrian Roos
2ff366a39a Merge "Keyguard: Increase clock size" into oc-dev 2017-06-07 23:54:05 +00:00
Adrian Roos
813d6177bc Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
am: 4317e457ba

Change-Id: Ieef81f7433083085e8c4ad9e503ba2d333c90cd1
2017-06-07 23:48:03 +00:00
Android Build Merger (Role)
983a3c4f5b Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f am: cf8cfc4412" into oc-dr1-dev-plus-aosp 2017-06-07 23:43:01 +00:00
Bryce Lee
3243d73e81 Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f
am: cf8cfc4412

Change-Id: Iceb7d0a6b88b3bf011e585ead483e924e1cc1b98
2017-06-07 23:41:57 +00:00
Android Build Merger (Role)
3b0ceaf0b1 Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f am: 50caf4af60" into oc-dr1-dev-plus-aosp 2017-06-07 23:41:55 +00:00
TreeHugger Robot
4317e457ba Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev 2017-06-07 23:40:37 +00:00
Bryce Lee
69569e269a Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f
am: 50caf4af60

Change-Id: I46c77e2180b981e1d9e89b81d73e9f47a3519c55
2017-06-07 23:40:06 +00:00
Sundeep Ghuman
1a58d16f74 Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad
am: 8d4014995d

Change-Id: I26ab39fbc393a8fcf89c1daad50a8b02081c947a
2017-06-07 23:39:00 +00:00
Android Build Merger (Role)
f10bf2902d Merge "Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad am: 216f596cee" into oc-dr1-dev-plus-aosp 2017-06-07 23:36:27 +00:00
Sundeep Ghuman
017174608a Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad
am: 216f596cee

Change-Id: I99adff8d11f498a8f640689e6a472dc26a83ad04
2017-06-07 23:35:32 +00:00
Android Build Merger (Role)
e21b705f13 Merge "Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1 -s ours am: 788b2b9364 -s ours" into oc-dr1-dev-plus-aosp 2017-06-07 23:35:15 +00:00
Bryce Lee
cf8cfc4412 Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am: f867733d4f

Change-Id: I7436b4e82365c2d83c1f38a856324e8e309920aa
2017-06-07 23:33:43 +00:00
Sundeep Ghuman
c633a31fda Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1
am: 8695bda38e  -s ours

Change-Id: I5c9c69aab0789b8b741353936bd753ea491972c6
2017-06-07 23:31:52 +00:00
Sundeep Ghuman
e1f1d19841 Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am: 584406f8e1 -s ours
am: 788b2b9364  -s ours

Change-Id: Id8c23e19ad74c5bac9097f4c123d385ff2503b60
2017-06-07 23:31:49 +00:00
Bryce Lee
50caf4af60 Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am: f867733d4f

Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
2017-06-07 23:31:48 +00:00
Sundeep Ghuman
8d4014995d Merge "Remove Wifi Badges from platform." into oc-dev
am: 09d06437ad

Change-Id: I939b42d12919635ddac9bdf91a17323f154001a9
2017-06-07 23:28:29 +00:00
Sundeep Ghuman
8695bda38e Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am: 584406f8e1

Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82
2017-06-07 23:25:57 +00:00
Sundeep Ghuman
216f596cee Merge "Remove Wifi Badges from platform." into oc-dev
am: 09d06437ad

Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589
2017-06-07 23:25:50 +00:00
Bryce Lee
f867733d4f Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev 2017-06-07 23:23:30 +00:00
Sundeep Ghuman
788b2b9364 Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am: 584406f8e1  -s ours

Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9
2017-06-07 23:23:20 +00:00
TreeHugger Robot
09d06437ad Merge "Remove Wifi Badges from platform." into oc-dev 2017-06-07 23:19:09 +00:00
TreeHugger Robot
584406f8e1 Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev 2017-06-07 23:18:11 +00:00
Selim Cinek
383cc53049 Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
am: ab67c300f3

Change-Id: I593cd3dd18eaf6a11f3eb961c0185150131772e6
2017-06-07 23:09:37 +00:00
Bryce Lee
46b01655b3 Revert "Coordinate configuration changes and window frame size."
This reverts commit afb45bba83.

Bug: 32839232
Fixes: 62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
2017-06-07 23:03:09 +00:00
Selim Cinek
ab67c300f3 Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev 2017-06-07 22:57:58 +00:00
Sanket Padawe
2fe6328048 Merge "Update strings for modem restricted state." into oc-dev am: 58977d1035
am: 6ef238a51c

Change-Id: I89e7d1ca10ec3e9519e3afc92a40b3e0dfc4ac98
2017-06-07 22:08:26 +00:00
Sanket Padawe
4170c83598 Merge "Update strings for modem restricted state." into oc-dev am: 58977d1035
am: 6acd6102c9

Change-Id: I8429e585c54f1336ba70311a012c019e30680fb8
2017-06-07 22:01:52 +00:00
Android Build Merger (Role)
46ee248162 Merge "Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am: fc1753d495 am: 52e73d8ffb" into oc-dr1-dev-plus-aosp 2017-06-07 21:58:52 +00:00
Jorim Jaggi
55a6482bc1 Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am: fc1753d495
am: 52e73d8ffb

Change-Id: Ic7db17b6e523db3360d57a686abb802975240fef
2017-06-07 21:57:52 +00:00
Jorim Jaggi
0a94cc6eb0 Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am: fc1753d495
am: 59fe02cf95

Change-Id: If712fd817a0179f6437dce5d234990a28743fedf
2017-06-07 21:56:25 +00:00
Sanket Padawe
6acd6102c9 Merge "Update strings for modem restricted state." into oc-dev
am: 58977d1035

Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a
2017-06-07 21:53:44 +00:00
Sanket Padawe
6ef238a51c Merge "Update strings for modem restricted state." into oc-dev
am: 58977d1035

Change-Id: I44ee9421ee32c68dd880176f12a89c8ecb3ae03b
2017-06-07 21:50:30 +00:00
Jorim Jaggi
59fe02cf95 Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am: fc1753d495

Change-Id: I5cd92b3e08e812f6634f7a8c793b8ac9ef3bcc00
2017-06-07 21:47:03 +00:00
Jorim Jaggi
52e73d8ffb Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am: fc1753d495

Change-Id: I2024b1b5e967fc64a4b068fd47643f94478dcf5c
2017-06-07 21:46:41 +00:00
TreeHugger Robot
58977d1035 Merge "Update strings for modem restricted state." into oc-dev 2017-06-07 21:42:37 +00:00
TreeHugger Robot
fc1753d495 Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev 2017-06-07 21:40:04 +00:00
Android Build Merger (Role)
06cc1610c6 Merge "Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf936 am: 334964899f" into oc-dr1-dev-plus-aosp 2017-06-07 21:13:29 +00:00
Selim Cinek
d9509202c4 Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf936
am: 334964899f

Change-Id: If6944735499ebd79b722cb1d9cefd4ee49e24234
2017-06-07 21:11:32 +00:00
Selim Cinek
ce40da8070 Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf936
am: 80b417c731

Change-Id: I37a02992a66fb0b9c1cceba926340690db014f87
2017-06-07 21:11:20 +00:00
Android Build Merger (Role)
ec643782bc Merge "Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3 am: 550d5da702" into oc-dr1-dev-plus-aosp 2017-06-07 21:08:26 +00:00
Winson Chung
f94e715b19 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3
am: 550d5da702

Change-Id: Ib31e7a0bf89db9fb347309fd14b44b0a3ca8cde2
2017-06-07 21:06:03 +00:00
Winson Chung
cb04745fd2 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3
am: f676ac8ce5

Change-Id: I35612147fad06e390887931d57325ae82976e4bf
2017-06-07 21:04:30 +00:00
Selim Cinek
334964899f Merge "Fixed a flicker of group notifications" into oc-dev
am: beba1bf936

Change-Id: I22d44dde99093cbcf10ca8cddb3beccfdc9bdafb
2017-06-07 21:03:12 +00:00
Selim Cinek
80b417c731 Merge "Fixed a flicker of group notifications" into oc-dev
am: beba1bf936

Change-Id: Ia5a12355fd1ed7ec8c9e4cea68e5b17764479ebd
2017-06-07 20:58:11 +00:00
Winson Chung
f676ac8ce5 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am: fd6b3c6da3

Change-Id: Ia156853dacf464f80ea46b35806c1f40d3107ecd
2017-06-07 20:57:41 +00:00
Winson Chung
550d5da702 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am: fd6b3c6da3

Change-Id: I262857f51aff127c3e1c4a223e22e7129060a9e7
2017-06-07 20:53:42 +00:00
Android Build Merger (Role)
7695c09dff Merge "Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am: 8d5b58a660 am: a3da26e146" into oc-dr1-dev-plus-aosp 2017-06-07 20:49:54 +00:00
Selim Cinek
beba1bf936 Merge "Fixed a flicker of group notifications" into oc-dev 2017-06-07 20:47:52 +00:00