Commit Graph

27729 Commits

Author SHA1 Message Date
Phil Weaver
99a66b5416 Make a11y settings display consistent
We were using two methods to decide whether or not to show
that an a11y service was enabled, one on the main
Accessibility screen and another on the individual service
screen. In some situations, an enabled service would show
up as enabled on the main screen but not enabled on its
individual screen.

Bug: 30829589
Change-Id: I560d86684a2fb8987d3dd06279e033ecb7cc1a58
2016-09-12 16:17:09 -07:00
Justin Klaassen
82926aebdf Update Night Light summary strings
am: ed765a4817

Change-Id: Ie21298848c8d9b80a96f2dd90c84bee6eeee8c6b
2016-09-12 21:00:57 +00:00
Justin Klaassen
ed765a4817 Update Night Light summary strings
Bug: 30771506
Test: Verified new strings show up in Night Light settings.
Change-Id: I36cc92d2644016f8f417daf9c06bccbe9fbd2d8c
2016-09-12 11:43:14 -07:00
Julia Reynolds
77b1f52574 Non-blockable notification packages can't be blocked.
Bug: 31404047
Change-Id: Icbe7e5e57983d281f6fe21e9b4715c822784d43c
2016-09-12 11:13:10 -04: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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
4e4e4ff19a Merge "Null check intent before starting "learn more"." into nyc-dev 2016-09-06 23:07:27 +00:00
Maurice Lam
c94f2b93af [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
2016-09-02 16:53:52 -07:00
Maurice Lam
d0a95da564 Remove help links when device is not provisioned. DO NOT MERGE
Bug: 31246856
Change-Id: Id638de8ab1c6b815d62916a584892be84cabe1ae
2016-09-01 17:12:20 -07:00
Andrew Sapperstein
e56d2be0b2 Null check intent before starting "learn more".
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.

BUG: 28381984
Fixes: 31246856
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
(cherry picked from commit 6561d4870f)
2016-09-01 21:57:59 +00:00
Rubin Xu
e0cb0dc2c8 Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev
am: 95089be460

Change-Id: I9455961b5743f4042f3984d4b868194baeca60b3
2016-09-01 10:48:47 +00:00
Rubin Xu
e1237c8096 Prompt to turn on/unlock profile before showing account sync settings
am: 3231afe95b

Change-Id: I4385b5c3d478028a5eabecfe23b073633e27e287
2016-09-01 10:48:46 +00:00
Rubin Xu
95089be460 Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev 2016-09-01 10:41:29 +00:00
Bill Yi
3e3da9b35b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 6030f64a58  -s ours

Change-Id: Ib9c3da80b8e9ed49d7d765299a0ff53d345f0cc9
2016-09-01 06:45:28 +00:00
Bill Yi
9538f83c79 Import translations. DO NOT MERGE
am: 3afce04bf8  -s ours

Change-Id: Ieacfa08b8f57ca01709324331f52b74c3cb80dfc
2016-09-01 06:45:27 +00:00
TreeHugger Robot
6030f64a58 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-01 06:36:19 +00:00
Bill Yi
3afce04bf8 Import translations. DO NOT MERGE
Change-Id: I97dae1e7f6b416d7a676e9c2c76942f6ada9582a
Auto-generated-cl: translation import
2016-08-31 21:56:25 -07:00
Doris Ling
e3f9654ebc Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912
am: e972a23faf

Change-Id: I60efde4b22dad901c491dc4ce7585c698047420b
2016-09-01 00:05:04 +00:00
Doris Ling
e972a23faf Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93
am: 7a15f88912

Change-Id: I3b04d4d87063f928fa76b4843ca0692c8d0311cb
2016-09-01 00:02:02 +00:00