Justin Klaassen
e0f4cafe07
Update Night Light summary strings am: ed765a4817 am: 82926aebdf
...
am: aaf0bc56ab
2016-09-12 22:00:00 +00:00
Justin Klaassen
aaf0bc56ab
Update Night Light summary strings am: ed765a4817
...
am: 82926aebdf
2016-09-12 21:02:53 +00:00
Justin Klaassen
82926aebdf
Update Night Light summary strings
...
am: ed765a4817
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
Daniel Nishi
ca5f8ae7fa
Merge "Fix the Settings lifecycle Robotests."
2016-09-12 18:18:51 +00:00
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
2016-09-10 00:14:29 +00:00
Fyodor Kupolov
8fd14485b7
Ignore onPreferenceChange for top level preference am: bf88b269ca am: 26a0f7037a
...
am: 07f4c033fd
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
2016-09-09 23:49:48 +00:00
Fyodor Kupolov
07f4c033fd
Ignore onPreferenceChange for top level preference am: bf88b269ca
...
am: 26a0f7037a
2016-09-09 23:49:47 +00:00
Fyodor Kupolov
0ec8187b46
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
...
am: 4b60607038
2016-09-09 23:46:50 +00:00
Fyodor Kupolov
26a0f7037a
Ignore onPreferenceChange for top level preference
...
am: bf88b269ca
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
Daniel Nishi
e8d30f7cc6
Fix the Settings lifecycle Robotests.
...
By breaking the tests into two pieces, we avoid any race conditions
with adding the fragment and also unit test the two components
separately.
Bug: 31370315
Test: m RunSettingsRoboTests
Change-Id: I9761b0b00141d3ce481a7edb5d8145c645c51da7
2016-09-09 13:36:59 -07:00
Jim Miller
5089927b8a
Merge "Check for missing preference before setting title." into nyc-mr1-dev am: ca9a78f2d1 am: cfc960df98
...
am: 018e75781c
2016-09-09 20:32:31 +00:00
Jim Miller
b5f3c1d9b6
Check for missing preference before setting title. am: 06458be226 am: 68306c3409
...
am: 3d0b4bb6c9
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
2016-09-09 20:27:11 +00:00
Jim Miller
3d0b4bb6c9
Check for missing preference before setting title. am: 06458be226
...
am: 68306c3409
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
2016-09-09 20:21:48 +00:00
Jim Miller
68306c3409
Check for missing preference before setting title.
...
am: 06458be226
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
2016-09-09 02:13:13 +00:00
Todd Kennedy
648bd1287d
Direct launch to web action am: 2ef1aa5894 am: de2da206af
...
am: 4de8f3f6bb
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
2016-09-09 02:06:58 +00:00
Todd Kennedy
4de8f3f6bb
Direct launch to web action am: 2ef1aa5894
...
am: de2da206af
2016-09-09 02:06:57 +00:00
Todd Kennedy
26c4f2b42e
Merge "Direct launch to web action" into nyc-mr1-dev
...
am: e162563e10
2016-09-09 01:59:33 +00:00
Todd Kennedy
de2da206af
Direct launch to web action
...
am: 2ef1aa5894
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
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
2016-09-07 16:17:15 +00:00
Salvador Martinez
8ec70281ee
Fixed Sound Settings summary text am: b706d4e956
...
am: d39c1fa395
2016-09-07 16:17:14 +00:00
Salvador Martinez
9079070347
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev
...
am: 20d19a89da
2016-09-07 16:14:45 +00:00
Salvador Martinez
d39c1fa395
Fixed Sound Settings summary text
...
am: b706d4e956
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
2016-09-07 12:08:33 +00:00
Bill Yi
d8919ba359
Import translations. DO NOT MERGE am: 596da67f4b -s ours
...
am: 9f2a012fcf
2016-09-07 12:06:31 +00:00
Bill Yi
9f2a012fcf
Import translations. DO NOT MERGE
...
am: 596da67f4b
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
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
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
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
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
2016-09-06 23:54:13 +00:00
