PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,196 Commits 1 Branch 0 Tags
24e673b0d2fd4a46ac1869b251918b02fb6236df
Commit Graph

31196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
24e673b0d2 Merge "Eliminate useless 'isManagedProfile' utils method" 2016-09-12 09:08:05 +00:00
Robin Lee
788671647c Eliminate useless 'isManagedProfile' utils method 
This exists in UserManager now

Change-Id: If35326a1fe0de3c7bfde842c5c170899dc5d819b
 2016-09-12 16:25:28 +09:00
Fyodor Kupolov
b15f936e10 Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev am: 4b60607038 am: 0ec8187b46 
am: fc50f21a5a

Change-Id: I7f7bbde4a4fc3250ac3d849b17019032b4dd1cb8
 2016-09-10 00:14:29 +00:00
Fyodor Kupolov
8fd14485b7 Ignore onPreferenceChange for top level preference am: bf88b269ca am: 26a0f7037a 
am: 07f4c033fd

Change-Id: I665d08af5fd4d6e0634c9889dbb3abfef7105fd7
 2016-09-10 00:14:28 +00:00
Fyodor Kupolov
fc50f21a5a Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev am: 4b60607038 
am: 0ec8187b46

Change-Id: I19dd337b94def9efa9ed5a7f152a11783be4e311
 2016-09-09 23:49:48 +00:00
Fyodor Kupolov
07f4c033fd Ignore onPreferenceChange for top level preference am: bf88b269ca 
am: 26a0f7037a

Change-Id: I491a5df37f1df3d9cd02dacabb69c57c287d686c
 2016-09-09 23:49:47 +00:00
Fyodor Kupolov
0ec8187b46 Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev 
am: 4b60607038

Change-Id: Ifbdf9af6b7119e9d5b696ab9e95b7a8a384c6138
 2016-09-09 23:46:50 +00:00
Fyodor Kupolov
26a0f7037a Ignore onPreferenceChange for top level preference 
am: bf88b269ca

Change-Id: Ib5208cb8b7d1a0bbaeed4ddbdbf6c15bce8b1b49
 2016-09-09 23:46:49 +00:00
Fyodor Kupolov
4b60607038 Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev 2016-09-09 23:30:35 +00:00
Jim Miller
5089927b8a Merge "Check for missing preference before setting title." into nyc-mr1-dev am: ca9a78f2d1 am: cfc960df98 
am: 018e75781c

Change-Id: I82d2e8c4143d7dce295cd5faede9e53e9fa10ba5
 2016-09-09 20:32:31 +00:00
Jim Miller
b5f3c1d9b6 Check for missing preference before setting title. am: 06458be226 am: 68306c3409 
am: 3d0b4bb6c9

Change-Id: I75dc4b7f832884fa4a6eb9f5e934d1da36d303f0
 2016-09-09 20:32:31 +00:00
Jim Miller
018e75781c Merge "Check for missing preference before setting title." into nyc-mr1-dev am: ca9a78f2d1 
am: cfc960df98

Change-Id: I24dc1a67ba334c05e70a4a81d62864e37bea2596
 2016-09-09 20:27:11 +00:00
Jim Miller
3d0b4bb6c9 Check for missing preference before setting title. am: 06458be226 
am: 68306c3409

Change-Id: Ibfeb785327d497fad3e8bff4de3b183ff5657fd2
 2016-09-09 20:27:10 +00:00
Jim Miller
cfc960df98 Merge "Check for missing preference before setting title." into nyc-mr1-dev 
am: ca9a78f2d1

Change-Id: I51aa91e1216c23773604a26ab3dabe0d4f5257aa
 2016-09-09 20:21:48 +00:00
Jim Miller
68306c3409 Check for missing preference before setting title. 
am: 06458be226

Change-Id: I1bbca453c4f58554bf7ec96a211496e3bce2acac
 2016-09-09 20:21:47 +00:00
TreeHugger Robot
ca9a78f2d1 Merge "Check for missing preference before setting title." into nyc-mr1-dev 2016-09-09 20:15:13 +00:00
Jim Miller
06458be226 Check for missing preference before setting title. 
Some preferences aren't available due to DPM, so check for null
before setting the title.

Fixes bug 31184335

Change-Id: I69f97274eef87755269fd8f7897edcc36087f8b2
 2016-09-09 11:54:12 -07:00
Todd Kennedy
34244de96c Merge "Direct launch to web action" into nyc-mr1-dev am: e162563e10 am: 26c4f2b42e 
am: e02dfb9d00

Change-Id: Id5c4e65c6cd9b1b057608110e5efa78c1d0eb2a4
 2016-09-09 02:13:13 +00:00
Todd Kennedy
648bd1287d Direct launch to web action am: 2ef1aa5894 am: de2da206af 
am: 4de8f3f6bb

Change-Id: I7129d3252f652a4e9fb410229cbfd9c1a7099289
 2016-09-09 02:13:11 +00:00
Todd Kennedy
e02dfb9d00 Merge "Direct launch to web action" into nyc-mr1-dev am: e162563e10 
am: 26c4f2b42e

Change-Id: I67e1979fe2b3518840881868f4735e6d4767cd59
 2016-09-09 02:06:58 +00:00
Todd Kennedy
4de8f3f6bb Direct launch to web action am: 2ef1aa5894 
am: de2da206af

Change-Id: Iea7aefc5ca85f7083f37ff678933aa293694ff97
 2016-09-09 02:06:57 +00:00
Todd Kennedy
26c4f2b42e Merge "Direct launch to web action" into nyc-mr1-dev 
am: e162563e10

Change-Id: Icafef8093cae5e4838be46d39405175b91c3bbbf
 2016-09-09 01:59:33 +00:00
Todd Kennedy
de2da206af Direct launch to web action 
am: 2ef1aa5894

Change-Id: I08a9f74e7ddb0f72881f82da40d950bf6b63e7d6
 2016-09-09 01:59:32 +00:00
TreeHugger Robot
e162563e10 Merge "Direct launch to web action" into nyc-mr1-dev 2016-09-09 01:50:07 +00:00
Todd Kennedy
2ef1aa5894 Direct launch to web action 
We want to be able to direct launch into the web action settings
Fixes: 31338071

Change-Id: I295729b8c9e0d3c1196ed820a9e9f6163bf611b4
 2016-09-08 13:51:12 -07:00
Salvador Martinez
162aa53133 Merge "Fixed Sound Settings summary text" into nyc-mr1-dev am: 20d19a89da am: 9079070347 
am: cc4d17cedf

Change-Id: Ib32e01796a41b54e664cf97aea45cf5e28748e9d
 2016-09-07 18:08:14 +00:00
Salvador Martinez
55e738aa03 Merge "resolve merge conflicts of 8ec7028 to master" 2016-09-07 18:02:12 +00:00
TreeHugger Robot
c2d59c0666 Merge "Replaced deprecated calls to INetworkPolicyListener." 2016-09-07 17:42:24 +00:00
Salvador Martinez
923534f641 resolve merge conflicts of 8ec7028 to master 
Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630
 2016-09-07 10:24:03 -07:00
Salvador Martinez
cc4d17cedf Merge "Fixed Sound Settings summary text" into nyc-mr1-dev am: 20d19a89da 
am: 9079070347

Change-Id: Iac8b96ca2fb2dd70a854ba5fd50cf0c390d52176
 2016-09-07 16:17:15 +00:00
Salvador Martinez
8ec70281ee Fixed Sound Settings summary text am: b706d4e956 
am: d39c1fa395

Change-Id: I73fa598eb0067b5c1497e7bac803b9d349eaf86c
 2016-09-07 16:17:14 +00:00
Salvador Martinez
9079070347 Merge "Fixed Sound Settings summary text" into nyc-mr1-dev 
am: 20d19a89da

Change-Id: Ia991091c2bcb17c61bb0dc0fca44f26995633c69
 2016-09-07 16:14:45 +00:00
Salvador Martinez
d39c1fa395 Fixed Sound Settings summary text 
am: b706d4e956

Change-Id: I6161e1ffbec8e17591240a0a16801afdae113fbb
 2016-09-07 16:14:44 +00:00
Salvador Martinez
20d19a89da Merge "Fixed Sound Settings summary text" into nyc-mr1-dev 2016-09-07 16:06:41 +00:00
Bill Yi
43bc2c5483 Import translations. DO NOT MERGE am: 596da67f4b -s ours am: 9f2a012fcf -s ours 
am: d8919ba359  -s ours

Change-Id: I6187f3016dec9f37ff3b9c0bc4707a2dc38f9e70
 2016-09-07 12:08:33 +00:00
Bill Yi
d8919ba359 Import translations. DO NOT MERGE am: 596da67f4b -s ours 
am: 9f2a012fcf  -s ours

Change-Id: Ibc51db1071568435ff4429ee415c56af9d442fc8
 2016-09-07 12:06:31 +00:00
Bill Yi
9f2a012fcf Import translations. DO NOT MERGE 
am: 596da67f4b  -s ours

Change-Id: Id618745ef778ce8c0d49cc2b917322c540f48ce4
 2016-09-07 12:03:59 +00:00
Bill Yi
596da67f4b Import translations. DO NOT MERGE 
Change-Id: Ic79af1cb3c770ec68e0665d9885e8e189497075f
Auto-generated-cl: translation import
 2016-09-07 03:20:53 -07:00
Salvador Martinez
b706d4e956 Fixed Sound Settings summary text 
The summary for Sound settings was not
descriptive enough when the volume was set
to 0% so additional strings were added. Now
it will change let you know the status
of the ringer and vibration settings when
at 0% volume. Espresso tests added to test
that text is properly updated in each of
these states.

Test: make SettingsTests
Bug: 31099179
Change-Id: Id49e2d0c4b7ac0f17efcdaf31de48d5eb678ca46
 2016-09-06 17:23:50 -07:00
Maurice Lam
7cf2990acc [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours am: 17ec053dd5 am: 27aabcd4df am: 6a51dfdcf3 am: c74cefce54 
am: c122156212  -s ours

Change-Id: I5814c785cb177173a8fb7027a409442e68d465df
 2016-09-06 23:55:46 +00:00
Andrew Sapperstein
32f20b9ebe Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: 27af0ed9e2 am: 86a4c442c1 am: 78f98e3b17 
am: 72c253f2b4

Change-Id: I10c47b22778cd427d3ad6e9d6d4899475a2d7371
 2016-09-06 23:55:45 +00:00
Andrew Sapperstein
497742c2d8 Null check intent before starting "learn more". am: e56d2be0b2 -s ours am: aa12cf603b am: 9177b11c8d am: b2d898dcad 
am: a26f0befd9

Change-Id: I87b0d27f33878d32ad68853291f5102faf248fdb
 2016-09-06 23:55:44 +00:00
Maurice Lam
81e21b0c7f [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours am: 17ec053dd5 am: c38b6a12cb 
am: 79b1cf5efd  -s ours

Change-Id: If35b5b461cd57410fe72d448c565feb3c908a2fb
 2016-09-06 23:54:14 +00:00
Andrew Sapperstein
7d194f45e1 Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: c16c5ded7b 
am: 4ff0fd3c5c

Change-Id: I90f36d3b12c7f1ecd3bbae287f236a12448aad20
 2016-09-06 23:54:13 +00:00
Andrew Sapperstein
59e0ac885d Null check intent before starting "learn more". am: e56d2be0b2 am: 1d20e81742 -s ours 
am: c09ea209da

Change-Id: I2f6a86b6f12d0ef276440c73b1d2181c6b2873bc
 2016-09-06 23:54:12 +00:00
Maurice Lam
32093ae446 Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 am: 595cae7039 
am: 81ba97c7db  -s ours

Change-Id: Iedf1f6c8859117d84336d93bf3c49a73245065db
 2016-09-06 23:54:11 +00:00
Maurice Lam
d12917eeaa Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s ours am: 534fa13894 am: 9e081e0db8 am: 39390c9527 
am: 5cd7289ae8  -s ours

Change-Id: I3210abf9a84ff7699390d46a54f2bd4bd75341ae
 2016-09-06 23:54:10 +00:00
Maurice Lam
c122156212 [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours am: 17ec053dd5 am: 27aabcd4df am: 6a51dfdcf3 
am: c74cefce54

Change-Id: I28c75cfcbdccca126d00b01cbfce5caafc20e3e2
 2016-09-06 23:31:17 +00:00
Andrew Sapperstein
72c253f2b4 Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: 27af0ed9e2 am: 86a4c442c1 
am: 78f98e3b17

Change-Id: I567224dfe3cfe10e898bba20481f0dacbfae1532
 2016-09-06 23:31:17 +00:00
Andrew Sapperstein
a26f0befd9 Null check intent before starting "learn more". am: e56d2be0b2 -s ours am: aa12cf603b am: 9177b11c8d 
am: b2d898dcad

Change-Id: Iedfccf8cbc5205413b7abe9fbf4ce24df46676d8
 2016-09-06 23:31:16 +00:00