Todd Kennedy
443761ae57
Merge "always adjust per-user application info" into oc-dev am: 91a9d65e42
...
am: 1581bb0b75
2017-06-07 18:55:19 +00:00
Todd Kennedy
dcbfba2a45
Merge "always adjust per-user application info" into oc-dev
...
am: 91a9d65e42
2017-06-07 18:52:27 +00:00
Android Build Merger (Role)
27e5b1676b
Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f am: 4710a7ad03" into oc-dr1-dev-plus-aosp
2017-06-07 18:51:15 +00:00
Todd Kennedy
1581bb0b75
Merge "always adjust per-user application info" into oc-dev
...
am: 91a9d65e42
2017-06-07 18:50:33 +00:00
Makoto Onuki
c93a5358c4
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f
...
am: 4710a7ad03
2017-06-07 18:49:58 +00:00
Makoto Onuki
9476d61c81
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f
...
am: dd0f409b16
2017-06-07 18:47:27 +00:00
Todd Kennedy
91a9d65e42
Merge "always adjust per-user application info" into oc-dev
2017-06-07 18:42:13 +00:00
Makoto Onuki
dd0f409b16
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
...
am: 28afa23a8f
2017-06-07 18:40:46 +00:00
Makoto Onuki
4710a7ad03
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
...
am: 28afa23a8f
2017-06-07 18:40:44 +00:00
Android Build Merger (Role)
dca73f48ce
Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 3158673eeb" into oc-dr1-dev-plus-aosp
2017-06-07 18:35:29 +00:00
Selim Cinek
65a5c680e2
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e
...
am: 3158673eeb
2017-06-07 18:34:18 +00:00
Android Build Merger (Role)
0b28195727
Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 0151c6886f" into oc-dr1-dev-plus-aosp
2017-06-07 18:34:02 +00:00
Makoto Onuki
28afa23a8f
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
2017-06-07 18:33:24 +00:00
Selim Cinek
53d851191b
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e
...
am: 0151c6886f
2017-06-07 18:33:05 +00:00
Albert Chaulk
8411eaf266
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
...
am: 44bb9c7281
2017-06-07 18:29:53 +00:00
Andreas Gampe
5085ef71e9
Framework: Remove SamplingProfiler
...
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.
Bug: 37272346
Test: m
Test: Device boots
Merged-In: I64d77244b5816ef1f605d19530b96be38f5c1bc6
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 11:26:15 -07:00
Selim Cinek
3158673eeb
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
...
am: 295dd7193e
2017-06-07 18:25:12 +00:00
TreeHugger Robot
44bb9c7281
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
2017-06-07 18:23:17 +00:00
Selim Cinek
0151c6886f
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
...
am: 295dd7193e
2017-06-07 18:22:09 +00:00
Selim Cinek
295dd7193e
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
2017-06-07 18:13:35 +00:00
Android Build Merger (Role)
910563fca0
Merge "Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c am: df8c918129" into oc-dr1-dev-plus-aosp
2017-06-07 17:39:32 +00:00
Jason Monk
aa6c28a011
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
...
am: df8c918129
2017-06-07 17:36:43 +00:00
Jason Monk
f470c8f3e1
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
...
am: 54d49157fd
2017-06-07 17:36:36 +00:00
Jason Monk
54d49157fd
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
...
am: 463985178c
2017-06-07 17:28:24 +00:00
Jason Monk
df8c918129
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
...
am: 463985178c
2017-06-07 17:28:23 +00:00
Jason Monk
463985178c
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
2017-06-07 17:17:47 +00:00
Sanket Padawe
c14c84c746
Update strings for modem restricted state.
...
Test: manual
Bug: 37377132
Change-Id: Iace44143623034c0255d7cceff839a4712972ee2
2017-06-07 10:02:24 -07:00
Android Build Merger (Role)
70329318de
Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: e871596f15" into oc-dr1-dev-plus-aosp
2017-06-07 17:00:58 +00:00
John Reck
52604bde0a
Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
...
am: e871596f15
2017-06-07 16:58:58 +00:00
John Reck
1079279d53
Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
...
am: 4ee3fb4c54
2017-06-07 16:58:09 +00:00
John Reck
4ee3fb4c54
Merge "Clear native shader when Paint shader changes" into oc-dev
...
am: d3e78478aa
2017-06-07 16:49:12 +00:00
John Reck
e871596f15
Merge "Clear native shader when Paint shader changes" into oc-dev
...
am: d3e78478aa
2017-06-07 16:49:08 +00:00
John Reck
d3e78478aa
Merge "Clear native shader when Paint shader changes" into oc-dev
2017-06-07 16:42:47 +00:00
Albert Chaulk
51d67cf693
Add a WM API to query the touch region for the input method window
...
This is needed by VR to handle keyboards that display a window larger
than the interactable region
Bug: 62194867
Test: Manually with prints
Change-Id: I7288956ed8da8d24e7c46ffa8f27461f7abbca5e
(cherry picked from commit 56162a0a51
2017-06-07 16:29:02 +00:00
Android Build Merger (Role)
5774a889d7
Merge "Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5 am: 107bfc46c6" into oc-dr1-dev-plus-aosp
2017-06-07 15:11:03 +00:00
Daniel Sandler
cb7c3ceeb4
Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
...
am: 107bfc46c6
2017-06-07 15:09:57 +00:00
Daniel Sandler
fec9ff30c0
Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
...
am: 2fe945c3a9
2017-06-07 15:07:25 +00:00
Daniel Sandler
2fe945c3a9
Merge "Use correct timebase in fg service notifications." into oc-dev
...
am: 630e7841e5
2017-06-07 15:02:00 +00:00
Daniel Sandler
107bfc46c6
Merge "Use correct timebase in fg service notifications." into oc-dev
...
am: 630e7841e5
2017-06-07 15:02:00 +00:00
Daniel Sandler
630e7841e5
Merge "Use correct timebase in fg service notifications." into oc-dev
2017-06-07 14:56:45 +00:00
Julia Reynolds
2f431e264d
Revert "Change default for group alert behavior"
...
This reverts commit 8f7828ebe7
2017-06-07 14:16:05 +00:00
Android Build Merger (Role)
ce8b01a53a
Merge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0 am: 805e32d19d" into oc-dr1-dev-plus-aosp
2017-06-07 14:00:48 +00:00
Wale Ogunwale
56fa261fec
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
...
am: ffbef55373
2017-06-07 13:58:26 +00:00
Wale Ogunwale
d2936e2944
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
...
am: 805e32d19d
2017-06-07 13:58:22 +00:00
Wale Ogunwale
ffbef55373
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
...
am: 7925f817d0
2017-06-07 13:50:25 +00:00
Wale Ogunwale
805e32d19d
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
...
am: 7925f817d0
2017-06-07 13:50:25 +00:00
Wale Ogunwale
7925f817d0
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
2017-06-07 13:45:10 +00:00
Jason Monk
62fe3205ba
Make DND tile primary toggle remember favorite zen
...
Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes: 37794901
2017-06-07 09:15:54 -04:00
Erik Kline
4a1059ca0e
Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3 am: f22995eed5
...
am: 48c3c00ee1
2017-06-07 09:59:43 +00:00
Erik Kline
48c3c00ee1
Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
...
am: f22995eed5
2017-06-07 09:51:52 +00:00
