Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
240 commits
Select commit Hold shift + click to select a range
2daec84
release-request-d4f45cf4-9d73-4828-baa4-f73aa4280cd0-for-git_pi-relea…
Aug 3, 2017
6b954c1
release-request-64fc473b-7e45-48f5-b2f7-3c916e338608-for-git_pi-relea…
Aug 6, 2017
beb1290
release-request-cdebbc35-65d5-4807-8fd6-60dc7e95ad1d-for-git_pi-relea…
Aug 7, 2017
3dc21bc
release-request-7f82cae7-9eea-4041-900f-be79b2eb873d-for-git_pi-relea…
Aug 8, 2017
3cc5514
release-request-999b130a-24cf-4106-967e-4713076535ff-for-git_pi-relea…
Aug 9, 2017
1508408
release-request-0b474cbb-ff20-424d-a570-a0a7b83a7705-for-git_pi-relea…
Aug 10, 2017
c1eba36
release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-relea…
Aug 13, 2017
2373e98
release-request-8c6f0e6c-413f-4241-b3dc-c159fdcc7655-for-git_pi-relea…
Aug 15, 2017
5ea6f20
release-request-c38dc7a9-f664-4c91-8e15-307b4f336902-for-git_pi-relea…
Aug 16, 2017
e4aa29c
release-request-5c36fbeb-1180-4a77-94d2-968e28da8f1f-for-git_pi-relea…
Aug 17, 2017
af6071c
release-request-38d4765e-6779-4912-a79f-25f77b8184a7-for-git_pi-relea…
Aug 20, 2017
c810e52
release-request-c7529296-e389-4c5b-82be-b0ae60d66df2-for-git_pi-relea…
Aug 22, 2017
c17e04d
release-request-c3d19af8-7ed9-4d42-9f37-c34f7f76db73-for-git_pi-relea…
Aug 23, 2017
667f461
release-request-729bcc05-d3c5-4aa4-9c1d-7a9e6ee59f06-for-git_pi-relea…
Aug 24, 2017
b228505
release-request-2c5efa61-1f02-4e74-bfeb-1ca3cd5028bd-for-git_pi-relea…
Aug 28, 2017
b0739f3
release-request-d9d65d1a-80f5-45e5-a00f-5a3915c3d445-for-git_pi-relea…
Aug 29, 2017
6c9ac2e
release-request-dbb5053c-c8af-4c07-a295-d7d7b281ce3f-for-git_pi-relea…
Aug 30, 2017
39be8cb
release-request-48587b2e-b0d9-4e33-ae5f-05bd16bc9d6f-for-git_pi-relea…
Aug 31, 2017
d545e67
release-request-b4448e78-a682-4bc1-b691-b70e74fef19f-for-git_pi-relea…
Sep 3, 2017
fa2b826
release-request-f7e8a600-b041-4cd7-94a0-d043d188195c-for-git_pi-relea…
Sep 6, 2017
3d06b23
release-request-51e6d4a7-52eb-462d-9bf2-f148ba83e4bd-for-git_pi-relea…
Sep 7, 2017
a536feb
release-request-cacfaf25-4304-4e6b-ab4e-089367c7ed39-for-git_pi-relea…
Sep 10, 2017
2b4b97a
release-request-0cb00bcd-1971-4ff1-bef2-5d0328e17cb1-for-git_pi-relea…
Sep 11, 2017
80f79d8
release-request-07e0701a-6024-4964-a0bf-f87d472b7ee2-for-git_pi-relea…
Sep 12, 2017
fa72f3d
release-request-8244a883-eac1-43aa-b800-33dd285ccdd1-for-git_pi-relea…
Sep 13, 2017
cccf2fa
release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-relea…
Sep 14, 2017
2aea08b
release-request-5cce6180-1979-44b8-a969-842cd4c8a044-for-git_pi-relea…
Sep 16, 2017
a5a171e
release-request-597e1591-1c15-4357-9e61-c1743f57743b-for-git_pi-relea…
Sep 17, 2017
65ce17f
release-request-849a3dc3-db53-4e70-9b7a-92295133ddeb-for-git_pi-relea…
Sep 19, 2017
db24541
release-request-e2e4ef47-6e2d-4fd3-aa91-845ba8826fbc-for-git_pi-relea…
Sep 20, 2017
7b566f2
release-request-ed8626b9-4479-4c76-9207-5f511f136606-for-git_pi-relea…
Sep 22, 2017
946c7f1
release-request-03f8b444-32f4-4a37-b710-3464560b2e0d-for-git_pi-relea…
Sep 23, 2017
6c12e5e
release-request-37e26775-0485-4a3d-a06c-026b3663c922-for-git_pi-relea…
Sep 26, 2017
2a4b3a2
release-request-ccf2fffc-f042-4ff3-9aa0-53d7f927fbf8-for-git_pi-relea…
Sep 27, 2017
c825513
release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-relea…
Sep 29, 2017
d53078a
release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-relea…
Sep 30, 2017
bc51e0b
Snap for 4373608 from 13b500297d9bfbdb66fbf607bcfb637c7911a7d5 to pi-…
Oct 3, 2017
159c476
Snap for 4375922 from 980e5b5869269e6aee4d41e7efda70af3465d086 to pi-…
Oct 4, 2017
b67e85b
Snap for 4380820 from 80fd58e3b642259e704f60131ae2ea739137a4c7 to pi-…
Oct 6, 2017
ff02a2a
Snap for 4383207 from 88a2ed19541bceb17f257760d1a971b1d2db63ea to pi-…
Oct 7, 2017
70da1bd
Snap for 4383777 from 52211db3473438cfe1d15a3b42512627e408cbab to pi-…
Oct 8, 2017
cb92f4d
Snap for 4384511 from b51efdb511fb247669dfe2ad32bbb938424be844 to pi-…
Oct 9, 2017
50a4397
Snap for 4386413 from 68468aa89282aadec5c4e3fa16cdbc4ecf8c1480 to pi-…
Oct 10, 2017
bec4ce7
Snap for 4388640 from 311c981cb0604ecb054565c74ed09ceeb7383da6 to pi-…
Oct 11, 2017
4e3db2b
Snap for 4393550 from bda0d166bb4e0aaa0c66095ef6e1038dd0f6d11e to pi-…
Oct 13, 2017
a612106
Snap for 4395235 from 43e86cefc942737d7d52b1b0e76707c44b0271ba to pi-…
Oct 14, 2017
f70a19a
Snap for 4396682 from 02909bd9e6cb358a3404af50ad52b5192a752f3a to pi-…
Oct 16, 2017
decd885
Snap for 4399706 from ffa3095aca0a68e37aef17a909285bfd83ca2413 to pi-…
Oct 17, 2017
a24a8cb
Snap for 4402171 from b73a67c7a0858e8c0b44d3421cf6d7b66a80f9e9 to pi-…
Oct 18, 2017
6856bb9
Snap for 4407698 from 7544e115a798f137a8efacb61ff0752c25ed5661 to pi-…
Oct 20, 2017
469246f
Snap for 4410151 from 9d85cfe762adc3d457f76cbcce5aec67b4d29877 to pi-…
Oct 21, 2017
4c8aef4
Snap for 4413317 from 43ff3b42028ea193dff35e09d9917fef60b884d6 to pi-…
Oct 24, 2017
379b473
Snap for 4415813 from c60a52b9aa55c634ca6fd170bdeeb5470007da5e to pi-…
Oct 25, 2017
9bb400e
Snap for 4418112 from 609b336d0513c24d7d6668560c7de1edd18816a8 to pi-…
Oct 26, 2017
a686e10
Snap for 4422293 from d629142a113a6b9d1900aaaac09effeeccb34a12 to pi-…
Oct 29, 2017
334a75f
Snap for 4422658 from 3977a6b482545181f66518720e6df7a08be95b91 to pi-…
Oct 30, 2017
a4deb64
Snap for 4425573 from e06aa2e739d48003a7737e8d2dcc7adf5ca179a6 to pi-…
Oct 31, 2017
273b65c
Snap for 4428213 from d568fd924ad3af103a69c79a7583dca8507fe107 to pi-…
Nov 1, 2017
2ad5e19
Snap for 4429796 from f21825721e6ac21d2329b244eaaddd96499b119f to pi-…
Nov 2, 2017
e72fb48
Add screen resource for Colors setting.
Nov 1, 2017
1d2de7e
Merge cherrypicks of [3167492, 3168293, 3168294, 3168295, 3168296, 31…
Nov 3, 2017
04c1412
Snap for 4434599 from c8b6833e13f654790bbb60dc7bd34f961934e235 to pi-…
Nov 5, 2017
4824ae3
Snap for 4437123 from b573ea7a05cdd3efc438026ab6423089631f50d2 to pi-…
Nov 7, 2017
16e180d
Snap for 4439972 from d85cd117c8387cee47f5b457e7121d81f4442174 to pi-…
Nov 8, 2017
bf9be08
Snap for 4442369 from 582182cfde65eaa18ebd3ce9814dc7aff813e38c to pi-…
Nov 9, 2017
e33bbc6
Prevent crash in Search from Stack overflow
Nov 9, 2017
a9d0de0
Merge cherrypicks of [3199697, 3199805, 3200163, 3199590] into pi-rel…
Nov 9, 2017
504801c
Snap for 4447680 from 3eec2834e0ad9e338a2e321427eed1d4b7eee78b to pi-…
Nov 12, 2017
d7f6f40
Revert "Expand all preferences when launch from search."
Nov 13, 2017
75ac74f
Merge cherrypicks of [3218895, 3220793, 3220522] into pi-release
Nov 13, 2017
a0361a0
Snap for 4450504 from a40f6a2a45cbb09e0105a04e44022791ef51f057 to pi-…
Nov 14, 2017
3593ec5
Snap for 4453288 from 97e75e97ef85a0f854976d8ec2d75c6e0486e7e5 to pi-…
Nov 15, 2017
2e1009f
Copy proguard rules needed for Lifecycle support
Nov 15, 2017
92eac6e
Merge cherrypicks of [3235880, 3236788, 3237072, 3235827, 3235828, 32…
Nov 15, 2017
2735b18
Snap for 4455093 from 8db327c14ff350a64e90086337f2e3142f7b3f3e to pi-…
Nov 16, 2017
1a1fc6b
Snap for 4459973 from e68467e03d2a6af54d2304ddc9f42c782ce6b3cd to pi-…
Nov 19, 2017
dc5d434
Snap for 4462748 from 95cd246993cb95b44e1936f3e888980ac2f6bfad to pi-…
Nov 21, 2017
3b9320f
Snap for 4464948 from bd642f9db8699f43bbfb76352e52bc31c4c06c21 to pi-…
Nov 22, 2017
b63c47c
Snap for 4466732 from 03b2d4c44cee59e4bbccd8be7707fd38f54bc839 to pi-…
Nov 23, 2017
fdfc27b
Snap for 4469253 from c61ed6356d5d3008aa1284241e1a469a21bee9dc to pi-…
Nov 27, 2017
072ed15
Snap for 4471243 from 44369ba0a29c86f52c635553ec1d68ae60236ab2 to pi-…
Nov 28, 2017
d30f106
Snap for 4473011 from a82c5091e1d2b8eb1f6eadafae197a45f3eafc89 to pi-…
Nov 29, 2017
8c2568e
Snap for 4476081 from 4031bc78e46a151c06b617c0274b5cf397820270 to pi-…
Nov 30, 2017
39b1075
Snap for 4481641 from f7540b42dc3bded709bcb8a84aaca392b1c8f1e3 to pi-…
Dec 3, 2017
eb1f7d7
Snap for 4482134 from 312d6c491279b4b35509415276a1d93ae11fa236 to pi-…
Dec 4, 2017
fb3677f
Snap for 4484469 from 22c7164d56e3675a34d4f1ccfae85668184ffae6 to pi-…
Dec 5, 2017
6887738
Snap for 4486962 from 91fff3093da85f0441e281349322419476dec0e6 to pi-…
Dec 6, 2017
7d9ba00
Snap for 4489599 from e677f49328b3b319316214af7abb7ab84c09aad6 to pi-…
Dec 7, 2017
0478e82
Snap for 4496165 from 2f7fd8c59286dac5bae8b49bdb4df3c901fa9f6c to pi-…
Dec 11, 2017
bbc79a2
Update package name for PictureAndPictureSettings
Dec 11, 2017
cddb308
Update package name for PictureAndPictureSettings
Dec 11, 2017
c9ac6b6
Merge cherrypicks of [3349132, 3348744, 3349021, 3348480, 3349133, 33…
Dec 12, 2017
3977271
Snap for 4498106 from 2f7240ceb5371bc8c9596d261fa32ad6cd14311a to pi-…
Dec 12, 2017
4fc31de
Snap for 4500033 from 10a160242177e62a344ea48027cadf5367ed3c2f to pi-…
Dec 13, 2017
f02aa4f
Snap for 4502278 from 7498b79569d9d6fc95c6c67b865f2e207225555a to pi-…
Dec 14, 2017
4bba5aa
Snap for 4507345 from 3a2573b8128623c57e04ae25a40e5c62ba1910ab to pi-…
Dec 17, 2017
088e23a
Snap for 4509671 from 1b279f97e9a7e64a3a7a8f57e8ec1def09389693 to pi-…
Dec 19, 2017
5928ef1
Snap for 4510491 from c56a641ebc636c9e83f991be99bdcf74ea0c97b3 to pi-…
Dec 20, 2017
9909c6b
Snap for 4511918 from 3abedefd38a2f25ded28aa130604cf92de338605 to pi-…
Dec 20, 2017
6694854
Catch NullPointerException in PreIndexDataCollector.
Dec 21, 2017
ab0805e
Merge cherrypicks of [3389033, 3388635, 3389278, 3389279] into pi-rel…
Dec 21, 2017
85c2103
Snap for 4517567 from 0dad10bc999e8bc154e80be0f094e3a4021180b4 to pi-…
Dec 24, 2017
4ea8e7d
Snap for 4519870 from ce3633be800ef846d650a95d225c5235839b4662 to pi-…
Dec 28, 2017
dee430e
Snap for 4523885 from 2c0cee41437c73f7581753d20f938ad0a658dabb to pi-…
Jan 3, 2018
0053cf2
Snap for 4525198 from 0590137ab25c944a3831076f0671dc2c5beb0b86 to pi-…
Jan 4, 2018
59c2323
Disable animation when adjusting font size.
Jan 4, 2018
be8680b
Merge cherrypicks of [3423271, 3423173, 3422907, 3422908, 3423174] in…
Jan 5, 2018
8a80f72
Snap for 4531101 from 7937798b9d4e0716db328d461eebe1fbc764dea7 to pi-…
Jan 7, 2018
ebca249
Snap for 4533842 from 0360957957518af27e58356fe1cb27bafc590ab0 to pi-…
Jan 9, 2018
2c76fac
Snap for 4535700 from c8a34adc187d8b7529df45691a80c93a59c79e0d to pi-…
Jan 10, 2018
83394fc
Snap for 4539010 from 66898b0cc9cf52249271a54b38a04b1725884478 to pi-…
Jan 11, 2018
c2fc02e
Snap for 4545621 from 844145686cdeafd38fe8e5c404eaf415f49ce7d5 to pi-…
Jan 14, 2018
fdf49b7
Snap for 4548429 from d6b0490dea268c6dd6d5ff015f417ac09c16d71e to pi-…
Jan 17, 2018
c73efcc
Snap for 4551672 from 46a1cb747cb2b277d6da228b8d9c8e539d1f20ca to pi-…
Jan 18, 2018
270371d
Snap for 4557233 from aaf307e71d3650db2818bfc9ac9943ff9dc65f1f to pi-…
Jan 21, 2018
47f75f9
merge in pi-release history after reset to master
Jan 23, 2018
36c4284
merge in pi-release history after reset to master
Jan 23, 2018
df27c89
Revert "Migrate to use instrumentation classes from settingslib."
Jan 22, 2018
443780f
Snap for 4560043 from 442a53c5fb31d9c5d15aad02201ab1ec54c81931 to pi-…
Jan 23, 2018
f3170b3
merge in pi-release history after reset to master
Jan 23, 2018
e2ad414
AF/FR Fix onActivityResult condition.
Jan 23, 2018
59711eb
merge in pi-release history after reset to master
Jan 23, 2018
7dfdd88
AF/FR Fix onActivityResult condition.
Jan 23, 2018
620326a
Merge cherrypicks of [3502352, 3501378, 3502262, 3503730, 3502234] in…
Jan 24, 2018
a6aceb7
Snap for 4562879 from 0ad01ef2e0de7a4a8f989ba054acbd6045954bf8 to pi-…
Jan 24, 2018
f98425c
Fix null pointer from PowerUsageFeatureProvider
Jan 24, 2018
81ffde5
Merge cherrypicks of [3510428, 3510260, 3510652, 3510635, 3510636, 35…
Jan 25, 2018
faa4812
Snap for 4565898 from 345a3cb61d7a6810568753887c0683fc3baf8616 to pi-…
Jan 25, 2018
94cf4c3
Prevent crash in recent app list
antonysargent Jan 25, 2018
d94a3fa
Merge cherrypicks of [3515403, 3515404, 3515463, 3513836, 3513837, 35…
Jan 25, 2018
a899519
Snap for 4571561 from 473260eec2a84b01c304f0749dc1a692b1ab3d5d to pi-…
Jan 28, 2018
a39f8fa
Snap for 4572138 from 9024b4eb1552754f29fd390545eb1b3d29dece11 to pi-…
Jan 29, 2018
08c8939
merge in pi-release history after reset to master
Jan 29, 2018
41dc099
merge in pi-release history after reset to master
Jan 29, 2018
7642b9c
Snap for 4574286 from acd313e644f7b3a2075ef12992f6d8c7f49b4943 to pi-…
Jan 30, 2018
2cb81b5
Snap for 4577102 from 54e304b897e7746a7edd04a134d1abc2a4fbe1ff to pi-…
Jan 31, 2018
9d92a1b
Snap for 4579913 from 3d8e2c44cbd54b69d6e8a0c2b4d0eecebee4d9d5 to pi-…
Feb 1, 2018
1ecf81c
Snap for 4585119 from ce9772f781a5bcb726f243c59e4818678f665f3f to pi-…
Feb 5, 2018
84d958d
Snap for 4587185 from 99fc2a7ea41d810bd21a95b328232c51e22a0a5b to pi-…
Feb 6, 2018
bf910de
Snap for 4590521 from d895f9374cacbf55c94ea7afb560ad4f138e1c05 to pi-…
Feb 7, 2018
4357112
Snap for 4593582 from c9f1d89dd36e1201255c297ee64d7b5b611144f3 to pi-…
Feb 8, 2018
068a4b9
Snap for 4598635 from 08addde8b5e3f2dbf60df570e67ac5abe5dae8ef to pi-…
Feb 11, 2018
8b396da
Snap for 4600820 from 9017e45d09765433d37e260d35d164eaee68b0f7 to pi-…
Feb 13, 2018
79e88d6
Snap for 4603395 from 03017fc928da91667778dbe0051a0216f0cd5a99 to pi-…
Feb 14, 2018
8417eb1
Snap for 4605948 from 49c8080a5021787ba1acb0c1d1fa1281f59b08e3 to pi-…
Feb 15, 2018
6b04182
Snap for 4610834 from 6f367a79cee128b49a353cf81efed1112572cc20 to pi-…
Feb 18, 2018
654b642
Snap for 4611397 from 8458b1971781e2fd1a65e39cbfd9d5012da20493 to pi-…
Feb 19, 2018
55dc158
Snap for 4612226 from 8d9dc9a6426e0584edf4cc7df28b9bd814dcbdfa to pi-…
Feb 20, 2018
a95009c
Snap for 4613997 from 28188cdd21d1ecafc327f44fca38cc96d8a3533e to pi-…
Feb 21, 2018
0aa1237
Snap for 4615953 from 032e7c0def455f0319fd61d00962680a9489ff8f to pi-…
Feb 22, 2018
5396e33
Snap for 4620899 from 96cb9d624f17415a036fd36361a8ee5ae64abaa2 to pi-…
Feb 25, 2018
2ecb989
Snap for 4623514 from eae1ce580693abbbd3448b914b7ab890fb6f30c7 to pi-…
Feb 27, 2018
78d21f6
Revert "Update to match now slice APIs"
alanv Feb 27, 2018
69267ab
Merge cherrypicks of [3666886, 3666906] into pi-release
Feb 27, 2018
c6f007f
Snap for 4625912 from f6cba5d9b5909094d118f4cd41212277a741bb57 to pi-…
Feb 28, 2018
ed372f7
Snap for 4628106 from e00a14b14ccaba440cab4026c241a1e850d4168a to pi-…
Mar 1, 2018
6ac0d6e
Snap for 4632767 from 229a6a2bc446d0102dcd330f077ca3e53c5ea7d3 to pi-…
Mar 4, 2018
b98d48c
Snap for 4633189 from 22a39c2b93bc66db71238274a7683d329232d124 to pi-…
Mar 5, 2018
5ae1758
Fix SettingsRoboTests build error with OpenJDK 9
gvictor Mar 5, 2018
8b76cc4
Merge cherrypicks of [3690002, 3691519, 3691668, 3690254, 3691428, 36…
Mar 5, 2018
c9ee97a
Snap for 4635315 from e8acc0c4bd14880542a0801db00b6f7fbe2d0a13 to pi-…
Mar 6, 2018
d1e38db
Snap for 4638586 from 106825383ada2eea1b207a532485b652999511f0 to pi-…
Mar 7, 2018
a214c4e
Snap for 4641295 from 6949175423eb13e0a393c4751b906188e16ac926 to pi-…
Mar 8, 2018
f601de9
Snap for 4647811 from 371404c4040ecef1110ba68c2e349497bad9b652 to pi-…
Mar 11, 2018
19b2d40
Snap for 4648297 from decea2055d8304305ed3bd6bb65f6dd6f7e9f377 to pi-…
Mar 12, 2018
8c055c0
Snap for 4651078 from 388b5314d7f42882baa5e03c06733e44c1d5a82d to pi-…
Mar 13, 2018
fc7aa95
Snap for 4653471 from 349c9b2691935199f96ad83fbdd712038bab6dcd to pi-…
Mar 14, 2018
2482170
Snap for 4656203 from eb029cffaf5ea126a8de0b2ae996e682326ce046 to pi-…
Mar 15, 2018
a7106d9
Snap for 4662252 from b0f251597c963b20e595fdf0201c5591230562e9 to pi-…
Mar 18, 2018
59867f8
Snap for 4665332 from cd908497d6b9f6e4b6a70a471b7216c023785daf to pi-…
Mar 20, 2018
62eeb28
Snap for 4667902 from 1a7e4daa954ab5d3eb74e91b6682a0d513504e20 to pi-…
Mar 21, 2018
8b3fd96
Snap for 4670666 from ce447d91912785fe1fbaef4a7ed4b2f52e8b85fd to pi-…
Mar 22, 2018
64e2d89
Snap for 4677756 from 362ba017898bd3df9c9fc7cd3e4ee92aa04a4d13 to pi-…
Mar 25, 2018
be16fd7
Snap for 4678196 from d6e81ab51bc600262d2980c5ea08dd806dfd6015 to pi-…
Mar 26, 2018
8842be0
Snap for 4680594 from 198a6495ad7552a9e0555ececa936c218937623c to pi-…
Mar 27, 2018
95db46a
Snap for 4683893 from 0a5367c0c4f8b65e0bc1a7ce0e4d8b7ceca45c5b to pi-…
Mar 28, 2018
988550b
Snap for 4686875 from 01933aa02cd627e44bcb5edcc417a1c0790d5142 to pi-…
Mar 29, 2018
cd7e9e6
Revert "Support AOD in the Universal Settings API"
Mar 29, 2018
8b20b32
Merge cherrypicks of [3817648] into pi-release
Mar 29, 2018
a61360e
Snap for 4693621 from 1873faefb888eebcfdc7c90bd2a5f4450bd83a64 to pi-…
Apr 1, 2018
74c1762
Snap for 4693955 from 27587f7884de7006f487f71d7cc6afd37a50a4f6 to pi-…
Apr 2, 2018
81a6ed7
Snap for 4696032 from a62df616f93800c94bb9ce8090fe336c2e6c6fab to pi-…
Apr 3, 2018
293146e
Snap for 4698807 from 54ee35c35c3fac1710ca08a85a19305ed9b2b0b4 to pi-…
Apr 4, 2018
4ba7df8
Snap for 4701683 from 086dbda4756aa8ef5d8c1461fb0c48c2b311b93e to pi-…
Apr 5, 2018
1689e8f
Snap for 4706961 from 47c2eebc857c2a070bfa5b0120b92095e9b9a4cf to pi-…
Apr 8, 2018
9f7b5e4
Snap for 4707594 from 2df5a0b322935de5916b05eb9fb29b9883eae1d4 to pi-…
Apr 9, 2018
5a1dfb3
Snap for 4710485 from c8613c7930aa28e0aa81b359a87ee03353f7fb69 to pi-…
Apr 10, 2018
29e1156
Snap for 4713750 from b86e8cadd9f5f6195ec0664e66e298998714bd9b to pi-…
Apr 11, 2018
78c9dcc
Snap for 4716599 from 17a463130edcf25598746f11b768d1c3a5b52318 to pi-…
Apr 12, 2018
cd480bf
Snap for 4722539 from 28041fb8cd92872cdd0b569fe84e2f367194e6ca to pi-…
Apr 15, 2018
5e174d3
Snap for 4725392 from 1d5d289d08e2bd961b007b470e3c5efe87de2f99 to pi-…
Apr 17, 2018
83ed904
Snap for 4728508 from 270f60857888557d2e263fad7f79cbc3b71ce90a to pi-…
Apr 18, 2018
285e6fa
Snap for 4731145 from 8a3bcaa3e330ef3109e397a9f44143bf4c77143a to pi-…
Apr 19, 2018
c5a6806
Snap for 4736748 from 77e716e463d7786359694235f9bc9aee3d2e85b1 to pi-…
Apr 22, 2018
3581048
Snap for 4739962 from b0877b390d8d96da30775dcd6161ecec59f006d0 to pi-…
Apr 24, 2018
214e618
Snap for 4742838 from 3f5444b9e4c7b503ab2eed5b73550d1a1d095225 to pi-…
Apr 25, 2018
acef1ff
Snap for 4745538 from a6b773a3e12f54d84a8656db9bf2fc8bc79d8c8f to pi-…
Apr 26, 2018
94bde00
Snap for 4751833 from 0929651a77172d8ac272eed77ab7ba62a0673eac to pi-…
Apr 29, 2018
c5a78c5
Snap for 4754571 from d940a680a51fed88e5e85e832f036adcf291911b to pi-…
May 1, 2018
9e30f80
Snap for 4756844 from 1a383907281a6f47236d4a150fed8b0626527685 to pi-…
May 2, 2018
1548076
Snap for 4759746 from f249555f97cf3a5cd128774bd4338d83e455e772 to pi-…
May 3, 2018
c474b07
Snap for 4765094 from 99902e1faf559844f43150700b7066effa515ed2 to pi-…
May 6, 2018
af8a9a9
Snap for 4767765 from e30007dcc0ea2fab5c81cb73cbec2f3008a03e39 to pi-…
May 8, 2018
4c62de9
Snap for 4770446 from 9a1d318b378d62485513e62ba4d85efd42810320 to pi-…
May 9, 2018
673ba5d
Snap for 4773106 from 7e31e22f572cf8a32ebe0d392b1ea4415c02e9fe to pi-…
May 10, 2018
0df7e32
Snap for 4778776 from 8a9c47e1bae042673ab888037f3871d8420d99da to pi-…
May 13, 2018
264e747
Snap for 4781566 from bafae44cb26c5751006d639e906537c5d3ffca1d to pi-…
May 15, 2018
f7979d6
Snap for 4784261 from 37a6a9144409d4cd89415241d86ac75c31de3d8c to pi-…
May 16, 2018
b32a185
Snap for 4787078 from 0cf2e41bf8e5f179b7f63e213095b36847378705 to pi-…
May 17, 2018
b6af72e
Snap for 4793185 from c96606500f522481986d01fdf972df63136f290a to pi-…
May 20, 2018
80ae767
Snap for 4793706 from 36029724b20f3acdad94896a83965ecc8d72360d to pi-…
May 21, 2018
ac99114
Snap for 4796401 from 4376993a873ecc68a05f6152919b8b3405bdeb76 to pi-…
May 22, 2018
31c8d74
Snap for 4799153 from e0e49140d22a6cb6299b94302c79f684d8489778 to pi-…
May 23, 2018
c96472c
Snap for 4801384 from 2e0709b3b8d637460232f49836a80da5f612f90b to pi-…
May 24, 2018
b83242c
Follow SliceManager API changes
Monkopedia May 23, 2018
fb5eba6
Merge cherrypicks of [4189833, 4186953, 4190512, 4190513] into pi-rel…
May 25, 2018
6e0d8e3
Snap for 4807121 from 8c60fc69b72493f4f46e79b0011cccb7ee46f415 to pi-…
May 27, 2018
ecdc564
Snap for 4810559 from cf2e1fd5936aae877615e2061908151ea1530596 to pi-…
May 30, 2018
6b88d6b
Snap for 4813226 from acfbc0eff45a8724817a90d81bd7173aeff732ff to pi-…
May 31, 2018
2b28a21
Snap for 4818534 from 8c56825ecdab17f0d52614ca5e6ac1b8b7a75e98 to pi-…
Jun 3, 2018
78aa410
Snap for 4818837 from d9bd2671462d218243a59c0d934839473bc22292 to pi-…
Jun 4, 2018
be7f9c7
Snap for 4821244 from bed0aff4a21d89f0b6b2bb2351aa6e63e9f60170 to pi-…
Jun 5, 2018
bcf0f7a
Snap for 4824048 from 688d1d81cba16deb03e0f495b1e65c71a981d5a4 to pi-…
Jun 6, 2018
3f067b0
Snap for 4826885 from daea8be9abd408f39a8b7451bc171cb60f8e6274 to pi-…
Jun 7, 2018
c27a211
Snap for 4829593 from ee96c3a259ad1ee3a8604730f8c722224ec07a50 to pi-…
Jun 8, 2018
da294f1
Snap for 4832339 from 29eec443e06abe949b522f114d2c0879baedac22 to pi-…
Jun 10, 2018
23059f5
Skip device index job if caller is not Settings app.
May 30, 2018
fa06be0
Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 43…
Jun 12, 2018
1582ec3
Unrestrict app if it been set as device admin app
Jun 28, 2018
0844fb9
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Jul 3, 2018
73b36ef
Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 45…
Jul 17, 2018
af4c772
Disable changing lock when device is not provisioned.
Jul 31, 2018
1708736
Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 47…
Aug 16, 2018
d91071f
Add custom Stag Horns dashboard
maxwen Aug 31, 2017
03da95c
Move GesturesStagSettings (1/2)
vjspranav Oct 27, 2018
5c70f81
Create README.md
Rakhi15 Nov 2, 2018
d081ff5
added logo
Rakhi15 Nov 2, 2018
a1d248e
added stagos logo
Rakhi15 Nov 2, 2018
2412e81
Delete dialog_firmeware_version.xml
Rakhi15 Nov 2, 2018
8deddfd
Added firmware_version
Rakhi15 Nov 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_USE_AAPT2 := true

LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, ../Horns/src)

LOCAL_STATIC_ANDROID_LIBRARIES := \
android-slices-builders \
Expand All @@ -32,6 +33,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v7-preference \
android-support-v7-recyclerview \
android-support-v14-preference \
android-support-design

LOCAL_JAVA_LIBRARIES := \
bouncycastle \
Expand All @@ -45,14 +47,33 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
jsr305 \
settings-logtags \

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
frameworks/support/v7/preference/res \
frameworks/support/v14/preference/res \
frameworks/support/v7/appcompat/res \
frameworks/support/v7/recyclerview/res \
frameworks/support/design/res \
packages/apps/Horns/res

LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_AAPT_FLAGS := --auto-add-overlay \
--extra-packages android.support.v7.preference \
--extra-packages android.support.v14.preference \
--extra-packages android.support.v17.preference \
--extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.recyclerview \
--extra-packages android.support.design \
--extra-packages com.stag.settings

ifneq ($(INCREMENTAL_BUILDS),)
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_JACK_ENABLED := incremental
LOCAL_JACK_FLAGS := --multi-dex native
endif

LOCAL_DEX_PREOPT := false

include frameworks/opt/setupwizard/library/common-gingerbread.mk
include frameworks/base/packages/SettingsLib/common.mk

Expand Down
32 changes: 30 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3147,7 +3147,7 @@
android:icon="@drawable/ic_homepage_system_dashboard"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="-1">
<intent-filter android:priority="-2">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<meta-data android:name="com.android.settings.category"
Expand All @@ -3163,7 +3163,7 @@
android:icon="@drawable/ic_homepage_support"
android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:enabled="@bool/config_support_enabled">
<intent-filter android:priority="-2">
<intent-filter android:priority="-3">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<intent-filter>
Expand Down Expand Up @@ -3327,6 +3327,34 @@
<service android:name=".fuelgauge.batterytip.AnomalyDetectionJobService"
android:permission="android.permission.BIND_JOB_SERVICE" />

<!-- Stag Horns -->
<activity android:name=".Settings$StagSettingsActivity"
android:label="@string/stag_settings_title"
android:icon="@drawable/ic_homepage_stag"
android:taskAffinity="com.android.settings">
<intent-filter android:priority="1">
<action android:name="com.stag.settings.StagSettings" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<intent-filter android:priority="-1">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.stag.settings.StagSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/stag_settings_summary"/>
</activity>

<!-- This is the longest AndroidManifest.xml ever. -->
</application>
</manifest>
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# android_packages_apps_Settings
added stagOS logo in Settings DMS
2 changes: 2 additions & 0 deletions proguard.flags
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*;
}

-keep class com.stag.settings.**

# We want to keep methods in Activity that could be used in the XML attribute onClick.
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
Expand Down
50 changes: 50 additions & 0 deletions res/drawable/ic_homepage_stag.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512.007dp"
android:height="512.007dp"
android:viewportWidth="512.007"
android:viewportHeight="512.007">

<path
android:fillColor="#FE6A16"
android:pathData="M189.281,177.823c-16.711,16.647-16.764,43.686-0.117,60.397l66.842,67.103l66.842-67.103 c16.647-16.711,16.594-43.75-0.117-60.397c-16.71-16.645-43.751-16.593-60.397,0.117l-6.329,6.355l-6.329-6.355 C233.031,161.231,205.99,161.178,189.281,177.823z" />
<path
android:fillColor="#F24500"
android:pathData="M256.006,305.323l66.842-67.103c16.647-16.711,16.594-43.75-0.117-60.397 c-16.71-16.645-43.751-16.593-60.397,0.117l-6.329,6.355L256.006,305.323z" />
<path
android:fillColor="#64E1DC"
android:pathData="M400.327,340.732c-31.976,45.34-84.746,75.013-144.322,75.013s-112.346-29.674-144.322-75.013 l-55.011,31.761c8.653,12.886,18.62,25.026,29.842,36.248c45.274,45.273,105.466,70.206,169.492,70.206 s124.218-24.933,169.491-70.206c11.222-11.222,21.189-23.361,29.841-36.248L400.327,340.732z" />
<path
android:fillColor="#00C8C8"
android:pathData="M400.327,340.732c-31.976,45.34-84.746,75.013-144.322,75.013c0,29.172,0,31.601,0,63.2 c64.026,0,124.218-24.933,169.491-70.206c11.222-11.222,21.189-23.361,29.841-36.248L400.327,340.732z" />
<path
android:fillColor="#C48958"
android:pathData="M 256.009 382.695 C 291.717522785 382.695 320.665 411.642477215 320.665 447.351 C 320.665 483.059522785 291.717522785 512.007 256.009 512.007 C 220.300477215 512.007 191.353 483.059522785 191.353 447.351 C 191.353 411.642477215 220.300477215 382.695 256.009 382.695 Z" />
<path
android:fillColor="#B27A49"
android:pathData="M320.659,447.347c0,35.707-28.946,64.653-64.653,64.653c0-64.653,0-87.352,0-129.306 C291.712,382.694,320.659,411.64,320.659,447.347z" />
<path
android:fillColor="#FE6A16"
android:pathData="M271.732,63.522c55.253,5.022,107.337,35.885,137.125,87.479s30.474,112.131,7.197,162.494 l55.011,31.761c6.833-13.936,12.363-28.639,16.47-43.967c16.57-61.844,8.067-126.439-23.946-181.887S379.887,24.291,318.043,7.72 C302.715,3.613,287.217,1.051,271.732,0V63.522z" />
<path
android:fillColor="#F24500"
android:pathData="M271.732,63.522c55.253,5.022,107.337,35.885,137.125,87.479 c25.264-14.586,27.367-15.8,54.733-31.601C431.576,63.953,379.887,24.291,318.043,7.72C302.715,3.613,287.217,1.051,271.732,0 V63.522z" />
<path
android:fillColor="#FFCDBE"
android:pathData="M 436.226 70.542 C 471.934522785 70.542 500.882 99.4894772149 500.882 135.198 C 500.882 170.906522785 471.934522785 199.854 436.226 199.854 C 400.517477215 199.854 371.57 170.906522785 371.57 135.198 C 371.57 99.4894772149 400.517477215 70.542 436.226 70.542 Z" />
<path
android:fillColor="#FFBEAA"
android:pathData="M403.896,79.21c30.923-17.854,70.465-7.258,88.318,23.665 c-55.991,32.326-75.649,43.676-111.983,64.653C362.379,136.604,372.973,97.064,403.896,79.21z" />
<path
android:fillColor="#4A7AFF"
android:pathData="M95.957,313.495c-23.277-50.362-22.591-110.9,7.197-162.493s81.871-82.457,137.125-87.479V0.001 c-15.486,1.05-30.983,3.612-46.312,7.72c-61.843,16.57-113.532,56.232-145.545,111.68S7.904,239.444,24.476,301.288 c4.108,15.328,9.637,30.031,16.47,43.967L95.957,313.495z" />
<path
android:fillColor="#0053BF"
android:pathData="M95.957,313.495c-23.277-50.362-22.591-110.9,7.197-162.493 c-25.264-14.586-27.367-15.8-54.733-31.601C16.409,174.849,7.904,239.444,24.476,301.288c4.108,15.328,9.637,30.031,16.47,43.967 L95.957,313.495z" />
<path
android:fillColor="#F2D1A5"
android:pathData="M 75.792 70.542 C 111.500522785 70.542 140.448 99.4894772149 140.448 135.198 C 140.448 170.906522785 111.500522785 199.854 75.792 199.854 C 40.0834772149 199.854 11.136 170.906522785 11.136 135.198 C 11.136 99.4894772149 40.0834772149 70.542 75.792 70.542 Z" />
<path
android:fillColor="#F2BB88"
android:pathData="M43.462,191.192c-30.923-17.854-41.518-57.394-23.665-88.318 C75.788,135.2,95.446,146.55,131.78,167.527C113.926,198.45,74.385,209.046,43.462,191.192z" />
</vector>
Binary file added res/drawable/stagoslogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
112 changes: 21 additions & 91 deletions res/layout/dialog_firmware_version.xml
Original file line number Diff line number Diff line change
@@ -1,91 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/sim_content_padding">

<TextView
style="@style/device_info_dialog_label"
android:id="@+id/firmware_version_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/firmware_version"/>
<TextView
style="@style/device_info_dialog_value"
android:id="@+id/firmware_version_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<TextView
style="@style/device_info_dialog_label"
android:id="@+id/security_patch_level_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_patch"/>
<TextView
style="@style/device_info_dialog_value"
android:id="@+id/security_patch_level_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:textColor="?android:attr/colorAccent"/>

<TextView
style="@style/device_info_dialog_label"
android:id="@+id/baseband_version_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/baseband_version"/>
<TextView
style="@style/device_info_dialog_value"
android:id="@+id/baseband_version_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<TextView
style="@style/device_info_dialog_label"
android:id="@+id/kernel_version_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/kernel_version"/>
<TextView
style="@style/device_info_dialog_value"
android:id="@+id/kernel_version_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<TextView
style="@style/device_info_dialog_label"
android:id="@+id/build_number_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/build_number"/>
<TextView
style="@style/device_info_dialog_value"
android:id="@+id/build_number_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

</LinearLayout>
</ScrollView>
<?xml version="1.0" encoding="utf-8"?>
<ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:orientation="vertical" android:padding="@dimen/sim_content_padding" android:layout_width="fill_parent" android:layout_height="fill_parent">
<LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:selectable="false">

<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/stagoslogo" android:scaleType="centerInside" android:adjustViewBounds="true" />

</LinearLayout>
<TextView android:id="@id/firmware_version_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/firmware_version" style="@style/device_info_dialog_label" />
<TextView android:id="@id/firmware_version_value" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/device_info_dialog_value" />
<TextView android:id="@id/security_patch_level_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/security_patch" style="@style/device_info_dialog_label" />
<TextView android:textColor="?android:colorAccent" android:id="@id/security_patch_level_value" android:background="?android:selectableItemBackground" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/device_info_dialog_value" />
<TextView android:id="@id/baseband_version_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/baseband_version" style="@style/device_info_dialog_label" />
<TextView android:id="@id/baseband_version_value" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/device_info_dialog_value" />
<TextView android:id="@id/kernel_version_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/kernel_version" style="@style/device_info_dialog_label" />
<TextView android:id="@id/kernel_version_value" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/device_info_dialog_value" />
<TextView android:id="@id/build_number_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/build_number" style="@style/device_info_dialog_label" />
<TextView android:id="@id/build_number_value" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/device_info_dialog_value" />
</LinearLayout>
</ScrollView>
1 change: 1 addition & 0 deletions res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
<color name="homepage_system_background">#757575</color>
<color name="homepage_support_background">#26459C</color>
<color name="homepage_generic_icon_background">#1A73E8</color>
<color name="homepage_stag_background">#00bcd4</color>
<!-- End of dashboard/homepage icon background colors -->

<color name="glif_error_color">@*android:color/material_red_A700</color>
Expand Down
18 changes: 18 additions & 0 deletions res/values/stag_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2016 The Pure Nexus Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<!-- Stag Horns -->
<string name="stag_settings_title">Horns</string>
<string name="stag_settings_summary">Where the Stag grows</string>

</resources>
10 changes: 1 addition & 9 deletions res/xml/system_dashboard_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@
android:title="@string/header_category_system"
settings:initialExpandedChildrenCount="4">

<Preference
android:key="gesture_settings"
android:title="@string/gesture_preference_title"
android:icon="@drawable/ic_settings_gestures"
android:order="-250"
android:fragment="com.android.settings.gestures.GestureSettings"
settings:controller="com.android.settings.gestures.GesturesSettingPreferenceController"/>

<!-- Backup -->
<Preference
android:key="backup_settings"
Expand Down Expand Up @@ -71,4 +63,4 @@
android:targetClass="@string/additional_system_update_menu" />
</Preference>

</PreferenceScreen>
</PreferenceScreen>
13 changes: 13 additions & 0 deletions src/com/android/settings/DeviceAdminAdd.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import android.widget.TextView;

import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserDialogs;
import com.android.settingslib.RestrictedLockUtils;
Expand Down Expand Up @@ -425,6 +426,9 @@ void addAndFinish() {
mDPM.setActiveAdmin(mDeviceAdmin.getComponent(), mRefreshing);
EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_ACTIVATED_BY_USER,
mDeviceAdmin.getActivityInfo().applicationInfo.uid);

unrestrictAppIfPossible(BatteryUtils.getInstance(this));

setResult(Activity.RESULT_OK);
} catch (RuntimeException e) {
// Something bad happened... could be that it was
Expand All @@ -446,6 +450,15 @@ void addAndFinish() {
finish();
}

void unrestrictAppIfPossible(BatteryUtils batteryUtils) {
// Unrestrict admin app if it is already been restricted
final String packageName = mDeviceAdmin.getComponent().getPackageName();
final int uid = batteryUtils.getPackageUid(packageName);
if (batteryUtils.isForceAppStandbyEnabled(uid, packageName)) {
batteryUtils.setForceAppStandby(uid, packageName, AppOpsManager.MODE_ALLOWED);
}
}

void continueRemoveAction(CharSequence msg) {
if (!mWaitingForRemoveMsg) {
return;
Expand Down
1 change: 1 addition & 0 deletions src/com/android/settings/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -164,5 +164,6 @@ public static class AppAndNotificationDashboardActivity extends SettingsActivity
public static class StorageDashboardActivity extends SettingsActivity {}
public static class AccountDashboardActivity extends SettingsActivity {}
public static class SystemDashboardActivity extends SettingsActivity {}
public static class StagSettingsActivity extends SettingsActivity {}

}
Loading