Commit Graph

29585 Commits

Author SHA1 Message Date
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
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
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
Tomohiro Takeda
6cd4db0576 Fix ApplicationsState.Session memory leak in settings app
Removes the creation of an unused session and some other redundant code
left behind when c5291b87 was applied.

Change-Id: Ie5ec0f00b3240df9cf2c4fa3bd05b49ba45f4547
2016-09-07 14:22:11 +02: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
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
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
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
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