PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,321 Commits 1 Branch 0 Tags
7976bb5b833772c0c331cf86ac7fedd2af8d1e9c
Commit Graph

31321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maurice Lam
c74cefce54 [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

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

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

Change-Id: I98af020a3759adaa9028ccea60eed1c552ab4339
 2016-09-06 23:28:47 +00:00
Maurice Lam
79b1cf5efd [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

Change-Id: I3c8a222bc5cc1e29c22aad1fab6160a448fa4053
 2016-09-06 23:27:05 +00:00
Andrew Sapperstein
4ff0fd3c5c Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a 
am: c16c5ded7b

Change-Id: Ibe1018f583d8f62b9fb2a5e46bdd259dc2959c8b
 2016-09-06 23:27:04 +00:00
Andrew Sapperstein
c09ea209da Null check intent before starting "learn more". am: e56d2be0b2 
am: 1d20e81742  -s ours

Change-Id: I088ff330ccc963475b255fa9003d789970e34591
 2016-09-06 23:27:03 +00:00
Maurice Lam
6a51dfdcf3 [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

Change-Id: I1be1f917392a5102e9f7c5178ef9316aadd29ad2
 2016-09-06 23:23:49 +00:00
Andrew Sapperstein
86a4c442c1 Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a 
am: 27af0ed9e2

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

Change-Id: Ie9389929ab179aafd2066db6483ba2cebf5563ee
 2016-09-06 23:23:47 +00:00
Maurice Lam
81ba97c7db Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 
am: 595cae7039

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

Change-Id: I11ea83d07eebfb55b8f1fbd0f431120c791314b1
 2016-09-06 23:22:52 +00:00
Andrew Sapperstein
27af0ed9e2 Merge "Null check intent before starting "learn more"." into nyc-dev 
am: 4e4e4ff19a

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

Change-Id: I5bf874a16c7939cdde5ab76728c19e199f9e8d3c
 2016-09-06 23:21:45 +00:00
Maurice Lam
c38b6a12cb [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours 
am: 17ec053dd5

Change-Id: I82cf5a36581abe7c9e14400822c20a38ba4ed03c
 2016-09-06 23:21:25 +00:00
Maurice Lam
39390c9527 Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s ours am: 534fa13894 
am: 9e081e0db8

Change-Id: I84fb88a14e3c15e00a0caade542a2c0ea4902777
 2016-09-06 23:18:46 +00:00
Maurice Lam
17ec053dd5 [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 
am: 746dff40ba  -s ours

Change-Id: I304081ab8e9ddaeb48af51cc07c4d3e131e7b13b
 2016-09-06 23:18:46 +00:00
Andrew Sapperstein
aa12cf603b Null check intent before starting "learn more". 
am: e56d2be0b2  -s ours

Change-Id: Ia53a28a35679db7d25c15c9cc9b862da7065f68a
 2016-09-06 23:18:45 +00:00
Maurice Lam
9e081e0db8 Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s ours 
am: 534fa13894

Change-Id: I6c98994b9b7629f38e7f718a8e559456ea97443c
 2016-09-06 23:16:47 +00:00
Maurice Lam
746dff40ba [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 
am: 94a0fa5759

Change-Id: I76460eee64ad7bc84d67379dc4f952deb2232130
 2016-09-06 23:14:25 +00:00
Maurice Lam
534fa13894 Remove help links when device is not provisioned. DO NOT MERGE 
am: d0a95da564  -s ours

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

Change-Id: I4d25b74d3cb8781b5f80f714d749dd59f3ec0c83
 2016-09-06 23:13:26 +00:00
Andrew Sapperstein
1d20e81742 Null check intent before starting "learn more". 
am: e56d2be0b2

Change-Id: I93aa097da0b6404dfbe279ee7d678e1f83a9ec93
 2016-09-06 23:13:26 +00:00
Maurice Lam
595cae7039 Remove help links when device is not provisioned. DO NOT MERGE 
am: d0a95da564

Change-Id: Ie8658b5ceb4546013f893f33301834db4a773f10
 2016-09-06 23:12:02 +00:00
Maurice Lam
94a0fa5759 [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af 
am: d278da7952

Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782
 2016-09-06 23:11:17 +00:00
Maurice Lam
d278da7952 [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE 
am: c94f2b93af

Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656
 2016-09-06 23:08:45 +00:00