Sudheer Shanka
54a6869814
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
...
am: 736cb0e33a
2017-06-08 05:45:37 +00:00
Ian Pedowitz
851bfc38d4
Merge "resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
2017-06-08 05:42:24 +00:00
Etan Cohen
d35a439a90
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
...
am: 89d6859dc4
2017-06-08 05:32:09 +00:00
Etan Cohen
89d6859dc4
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
2017-06-08 05:26:21 +00:00
Kevin Chyn
f0e1d6eab8
Add setting and permission for assist gesture
...
am: 4fddc9fa4d
2017-06-08 04:53:31 +00:00
Kevin Chyn
4fddc9fa4d
Add setting and permission for assist gesture
...
Bug: 37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
2017-06-07 21:42:55 -07:00
Ian Pedowitz
5eee5988c1
resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
2017-06-07 19:54:21 -07:00
Sudheer Shanka
736cb0e33a
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
...
am: f34713066e
2017-06-08 00:15:23 +00:00
Android Build Merger (Role)
1520d813e0
Merge "Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a am: dacd9ed196" into oc-dr1-dev-plus-aosp
2017-06-08 00:11:05 +00:00
Ian Pedowitz
7ea4f66f35
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
...
am: 695f21a661
2017-06-08 00:10:39 +00:00
Sudheer Shanka
f34713066e
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
2017-06-08 00:08:47 +00:00
Adrian Roos
cd8210731b
Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a
...
am: dacd9ed196
2017-06-08 00:08:30 +00:00
Adrian Roos
fcaf2d1ae9
Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a
...
am: b42e50a3a0
2017-06-08 00:08:22 +00:00
Adrian Roos
b42e50a3a0
Merge "Keyguard: Increase clock size" into oc-dev
...
am: 2ff366a39a
2017-06-08 00:00:25 +00:00
Ian Pedowitz
695f21a661
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
2017-06-08 00:00:20 +00:00
Adrian Roos
dacd9ed196
Merge "Keyguard: Increase clock size" into oc-dev
...
am: 2ff366a39a
2017-06-07 23:59:53 +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
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
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
2017-06-07 23:40:06 +00:00
Sundeep Ghuman
1a58d16f74
Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad
...
am: 8d4014995d
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
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
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
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
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
2017-06-07 23:31:48 +00:00
Sundeep Ghuman
8d4014995d
Merge "Remove Wifi Badges from platform." into oc-dev
...
am: 09d06437ad
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
2017-06-07 23:25:57 +00:00
Sundeep Ghuman
216f596cee
Merge "Remove Wifi Badges from platform." into oc-dev
...
am: 09d06437ad
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
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
2017-06-07 23:09:37 +00:00
Bryce Lee
46b01655b3
Revert "Coordinate configuration changes and window frame size."
...
This reverts commit afb45bba83
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
Selim Cinek
a7c69637f8
Fixed an issue where the icons had the wrong color
...
The color of the icons was taken from the ambient view
and wasn't updated when dark changed.
Change-Id: I472e76ff9d4d92500faae5517f10bdeb2658936d
Fixes: 62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
2017-06-07 15:52:30 -07:00
Sanket Padawe
2fe6328048
Merge "Update strings for modem restricted state." into oc-dev am: 58977d1035
...
am: 6ef238a51c
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
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
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
2017-06-07 21:56:25 +00:00
Sanket Padawe
6acd6102c9
Merge "Update strings for modem restricted state." into oc-dev
...
am: 58977d1035
2017-06-07 21:53:44 +00:00
Sanket Padawe
6ef238a51c
Merge "Update strings for modem restricted state." into oc-dev
...
am: 58977d1035
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
2017-06-07 21:47:03 +00:00
