Andre Lago
3fa139c7b2
[media] Separate ringtones for managed profiles
...
Separate the default system ringtone settings for managed profiles,
which previously used the same default ringtones as the personal profile
they belong to
Bug: 30658854
Change-Id: I22c69c7b8d31c7c424f5e00a3d9febac98b93d74
2016-08-18 09:58:26 +01:00
Andre Lago
ea35e07e1b
[Settings] Added setting SYNC_PARENT_SOUNDS
...
Added a setting that specifies wether a managed profile's ringtones
should be the same as its parent
Change-Id: I90e20cee111640404c3758030f41d5b2b5af1c28
2016-08-15 10:08:04 +01:00
Adam Lesinski
3e1cd845e6
SamplingTimer: Fix issue with summary recording too much am: 9edd6be542 am: e5852eb501
...
am: 4e4e50cd02
2016-08-14 00:45:24 +00:00
Hui Shu
1fa574c3c5
Fix documentation. am: bd042e666a am: 440d84f99a
...
am: 68cee7e245
2016-08-14 00:41:33 +00:00
Adrian Roos
1fafcc6f64
Assist: Allow disabling the disclosure animation am: 2335bd6787 am: 57d1601849
...
am: ae96089711
2016-08-14 00:34:13 +00:00
Colin Cross
2c5439972f
resolve merge conflicts of f95418e to master
...
Change-Id: If2b4d34b3ba64f61214b72fd71f8767500e68a53
2016-08-13 11:20:37 -07:00
Adam Lesinski
4e4e50cd02
SamplingTimer: Fix issue with summary recording too much am: 9edd6be542
...
am: e5852eb501
2016-08-13 00:59:35 +00:00
Adam Lesinski
e5852eb501
SamplingTimer: Fix issue with summary recording too much
...
am: 9edd6be542
2016-08-13 00:52:03 +00:00
TreeHugger Robot
2eafc97b32
Merge "Allow calls to TimedRemoteCaller in parallel."
2016-08-12 23:36:44 +00:00
Hui Shu
68cee7e245
Fix documentation. am: bd042e666a
...
am: 440d84f99a
2016-08-12 23:19:41 +00:00
Adrian Roos
ae96089711
Assist: Allow disabling the disclosure animation am: 2335bd6787
...
am: 57d1601849
2016-08-12 23:16:53 +00:00
Adam Lesinski
9edd6be542
SamplingTimer: Fix issue with summary recording too much
...
The summary is supposed to just hold enough data to continue counting
once the device has reset. Since kernel stats reset when the device
resets, and the first update is ignored to account for soft resets where the
kernel continues running, SamplingTimer should not be recording the last value
it saw from /proc/wakelocks in the summary.
Bug:30575302
Change-Id: Ic193bc5af9a0ede514e3abc8146523d7316c47d3
2016-08-12 15:49:44 -07:00
Hui Shu
440d84f99a
Fix documentation.
...
am: bd042e666a
2016-08-12 21:29:47 +00:00
Philip P. Moltmann
a01bda837b
Allow calls to TimedRemoteCaller in parallel.
...
Before the second thread canceled the call from the first thread as the
awaitedSequenceId was set to the second thread.
Change-Id: I7de709dee260a009761e0a3e73f3fe0695d2da2a
2016-08-12 14:19:18 -07:00
Alison Cichowlas
f95418e0cb
Add restart to GlobalActions. am: f8eca405c1
...
am: 091fc718d4
2016-08-12 20:35:27 +00:00
Adrian Roos
57d1601849
Assist: Allow disabling the disclosure animation
...
am: 2335bd6787
2016-08-12 20:35:22 +00:00
Alison Cichowlas
091fc718d4
Add restart to GlobalActions.
...
am: f8eca405c1
2016-08-12 20:18:41 +00:00
Adrian Roos
2335bd6787
Assist: Allow disabling the disclosure animation
...
Change-Id: I6e7ed00f066fda7cc268119e7aa4133010aa69c1
Fixes: 30809067
2016-08-12 12:04:53 -07:00
Kirill Grouchnikov
9cce5d04ca
Merge "Document exception thrown in SoundEffectConstants"
2016-08-12 19:02:56 +00:00
Aga Madurska
e27c677f33
Avoid an NPE while checking view location on screen. am: a56454645f
...
am: a78e8d6219
2016-08-12 18:24:42 +00:00
Aga Madurska
a78e8d6219
Avoid an NPE while checking view location on screen.
...
am: a56454645f
2016-08-12 18:18:01 +00:00
Agnieszka Madurska
5e933c1e43
Merge "Avoid an NPE while checking view location on screen." into cw-f-dev
2016-08-12 18:08:25 +00:00
TreeHugger Robot
9d911ea5c2
Merge "Enable StrictMode.detectFileUriExposure() for drag and drop"
2016-08-12 17:53:33 +00:00
Alison Cichowlas
f8eca405c1
Add restart to GlobalActions.
...
Update power icon in GlobalActions for consistency
with new restart icon.
Bug: 30395806
Change-Id: I5ab20c15c889384fb685fc678fbf9ed912fcde5d
2016-08-12 13:41:00 -04:00
Kirill Grouchnikov
35d5b0fdea
Document exception thrown in SoundEffectConstants
...
Change-Id: Id4ecf66c8c2ac6ead2a79438e4db702fd6dd196e
2016-08-12 13:12:23 -04:00
Aga Madurska
a56454645f
Avoid an NPE while checking view location on screen.
...
Bug:30483148
Change-Id: I115da4fefff5fecc04135e2b150e1e77445cb86e
2016-08-12 18:00:25 +01:00
John Reck
e886ad2c95
resolve merge conflicts of cdbdd46 to master
...
Change-Id: I18a60477799865973fc9d6c876d95e3cee6e5031
2016-08-12 08:24:33 -07:00
John Reck
cdbdd46fb3
Fix NPE in TextureView am: 7e237189c2
...
am: ed1f1399d4
2016-08-12 14:39:36 +00:00
John Reck
ed1f1399d4
Fix NPE in TextureView
...
am: 7e237189c2
2016-08-12 14:31:49 +00:00
Hui Shu
bd042e666a
Fix documentation.
...
Remove spurious duplicate line in JavaDoc.
Change-Id: I7ee7339d2ef21241ff21e66683e37e8ea0bbfaa4
2016-08-12 00:27:39 +00:00
TreeHugger Robot
e74f34b6cf
Merge "Bring back old constructor for layoutlib."
2016-08-12 00:26:36 +00:00
Jakub Pawlowski
1366a9a4fb
resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776 am: 84b61fb4b0
...
am: ecd10beefd
2016-08-11 23:17:53 +00:00
Jakub Pawlowski
ecd10beefd
resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776
...
am: 84b61fb4b0
2016-08-11 23:11:19 +00:00
Jakub Pawlowski
84b61fb4b0
resolve merge conflicts of 5671277 to stage-aosp-master
...
am: 5aa4ba3776
2016-08-11 23:05:49 +00:00
Jeff Sharkey
a4603d3c37
Bring back old constructor for layoutlib.
...
Bug: 28634953
Change-Id: I72edcdc498b4d85d68e85768dcf839ecb1ab5db7
2016-08-11 16:54:15 -06:00
Jakub Pawlowski
5aa4ba3776
resolve merge conflicts of 5671277 to stage-aosp-master
...
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
2016-08-11 15:53:06 -07:00
Jakub Pawlowski
747711ce9b
Add LE Secure Connection data parsing (1/4)
...
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
2016-08-11 22:18:19 +00:00
Jeff Sharkey
ce65646208
Merge "Take the "tf" out of "wtf"."
2016-08-11 21:21:54 +00:00
Jeff Sharkey
012d5e05cf
Take the "tf" out of "wtf".
...
You can't DropBox until you have DropBox, otherwise bad things will
happen.
Bug: 28634953
Change-Id: I43c590ac329c7a544215df3023ad07a0b32b5691
2016-08-11 15:20:25 -06:00
Phil Weaver
30cf918c4b
Limit capabilities of a11y gesture dispatch. am: a8918f23c7 am: 0e97bb6c1a
...
am: 3d40beacfd
2016-08-11 21:11:57 +00:00
Phil Weaver
9332022807
Don't preserve a11y focus in hierarchy state. am: f40ee509c6 am: 711d7260ba
...
am: 99633b3700
2016-08-11 21:11:49 +00:00
Phil Weaver
3d40beacfd
Limit capabilities of a11y gesture dispatch. am: a8918f23c7
...
am: 0e97bb6c1a
2016-08-11 21:03:28 +00:00
Phil Weaver
99633b3700
Don't preserve a11y focus in hierarchy state. am: f40ee509c6
...
am: 711d7260ba
2016-08-11 21:03:19 +00:00
Phil Weaver
0e97bb6c1a
Limit capabilities of a11y gesture dispatch.
...
am: a8918f23c7
2016-08-11 20:53:44 +00:00
Phil Weaver
711d7260ba
Don't preserve a11y focus in hierarchy state.
...
am: f40ee509c6
2016-08-11 20:53:37 +00:00
Christopher Tate
328439d0a2
Check system & lock wallpaper backup eligibility independently am: 6172266154 am: 611afaf4ae
...
am: 9649aecab6
2016-08-11 20:43:44 +00:00
Christopher Tate
9649aecab6
Check system & lock wallpaper backup eligibility independently am: 6172266154
...
am: 611afaf4ae
2016-08-11 20:35:43 +00:00
Christopher Tate
611afaf4ae
Check system & lock wallpaper backup eligibility independently
...
am: 6172266154
2016-08-11 20:28:44 +00:00
Esteban Talavera
50421f1a38
Do not toggle OEM unlock if bootloader unlocked am: c48b20f8f1 am: 83583bd596
...
am: b9bef2fb7d
2016-08-11 19:11:52 +00:00
Esteban Talavera
b9bef2fb7d
Do not toggle OEM unlock if bootloader unlocked am: c48b20f8f1
...
am: 83583bd596
2016-08-11 19:00:37 +00:00
