OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMake a11y settings display consistent am: 99a66b5416
Phil Weaver [Tue, 13 Sep 2016 01:19:12 +0000 (01:19 +0000)]
Make a11y settings display consistent am: 99a66b5416
am: 17fb0f6cf5

Change-Id: Iebeeb744a08d0a89803d8743dbe85950b1320147

7 years agoMake a11y settings display consistent
Phil Weaver [Tue, 13 Sep 2016 01:13:41 +0000 (01:13 +0000)]
Make a11y settings display consistent
am: 99a66b5416

Change-Id: Ic62d9ac58ebab8e52d9bb22c7c377d640fc027bb

7 years agoMake a11y settings display consistent
Phil Weaver [Sat, 10 Sep 2016 00:36:03 +0000 (17:36 -0700)]
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

7 years agoUpdate Night Light summary strings am: ed765a4817
Justin Klaassen [Mon, 12 Sep 2016 21:02:53 +0000 (21:02 +0000)]
Update Night Light summary strings am: ed765a4817
am: 82926aebdf

Change-Id: I861f710b4de7d034dddd4c4de1bec5e3e32ca0c7

7 years agoUpdate Night Light summary strings
Justin Klaassen [Mon, 12 Sep 2016 21:00:57 +0000 (21:00 +0000)]
Update Night Light summary strings
am: ed765a4817

Change-Id: Ie21298848c8d9b80a96f2dd90c84bee6eeee8c6b

7 years agoUpdate Night Light summary strings
Justin Klaassen [Mon, 12 Sep 2016 18:40:03 +0000 (11:40 -0700)]
Update Night Light summary strings

Bug: 30771506
Test: Verified new strings show up in Night Light settings.
Change-Id: I36cc92d2644016f8f417daf9c06bccbe9fbd2d8c

7 years agoMerge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev am: 4b606...
Fyodor Kupolov [Fri, 9 Sep 2016 23:49:48 +0000 (23:49 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev am: 4b60607038
am: 0ec8187b46

Change-Id: I19dd337b94def9efa9ed5a7f152a11783be4e311

7 years agoIgnore onPreferenceChange for top level preference am: bf88b269ca
Fyodor Kupolov [Fri, 9 Sep 2016 23:49:47 +0000 (23:49 +0000)]
Ignore onPreferenceChange for top level preference am: bf88b269ca
am: 26a0f7037a

Change-Id: I491a5df37f1df3d9cd02dacabb69c57c287d686c

7 years agoMerge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
Fyodor Kupolov [Fri, 9 Sep 2016 23:46:50 +0000 (23:46 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
am: 4b60607038

Change-Id: Ifbdf9af6b7119e9d5b696ab9e95b7a8a384c6138

7 years agoIgnore onPreferenceChange for top level preference
Fyodor Kupolov [Fri, 9 Sep 2016 23:46:49 +0000 (23:46 +0000)]
Ignore onPreferenceChange for top level preference
am: bf88b269ca

Change-Id: Ib5208cb8b7d1a0bbaeed4ddbdbf6c15bce8b1b49

7 years agoMerge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
Fyodor Kupolov [Fri, 9 Sep 2016 23:30:35 +0000 (23:30 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev

7 years agoMerge "Check for missing preference before setting title." into nyc-mr1-dev am: ca9a7...
Jim Miller [Fri, 9 Sep 2016 20:27:11 +0000 (20:27 +0000)]
Merge "Check for missing preference before setting title." into nyc-mr1-dev am: ca9a78f2d1
am: cfc960df98

Change-Id: I24dc1a67ba334c05e70a4a81d62864e37bea2596

7 years agoCheck for missing preference before setting title. am: 06458be226
Jim Miller [Fri, 9 Sep 2016 20:27:10 +0000 (20:27 +0000)]
Check for missing preference before setting title. am: 06458be226
am: 68306c3409

Change-Id: Ibfeb785327d497fad3e8bff4de3b183ff5657fd2

7 years agoMerge "Check for missing preference before setting title." into nyc-mr1-dev
Jim Miller [Fri, 9 Sep 2016 20:21:48 +0000 (20:21 +0000)]
Merge "Check for missing preference before setting title." into nyc-mr1-dev
am: ca9a78f2d1

Change-Id: I51aa91e1216c23773604a26ab3dabe0d4f5257aa

7 years agoCheck for missing preference before setting title.
Jim Miller [Fri, 9 Sep 2016 20:21:47 +0000 (20:21 +0000)]
Check for missing preference before setting title.
am: 06458be226

Change-Id: I1bbca453c4f58554bf7ec96a211496e3bce2acac

7 years agoMerge "Check for missing preference before setting title." into nyc-mr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 20:15:12 +0000 (20:15 +0000)]
Merge "Check for missing preference before setting title." into nyc-mr1-dev

7 years agoCheck for missing preference before setting title.
Jim Miller [Fri, 9 Sep 2016 18:54:12 +0000 (11:54 -0700)]
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

7 years agoMerge "Direct launch to web action" into nyc-mr1-dev am: e162563e10
Todd Kennedy [Fri, 9 Sep 2016 02:06:58 +0000 (02:06 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev am: e162563e10
am: 26c4f2b42e

Change-Id: I67e1979fe2b3518840881868f4735e6d4767cd59

7 years agoDirect launch to web action am: 2ef1aa5894
Todd Kennedy [Fri, 9 Sep 2016 02:06:57 +0000 (02:06 +0000)]
Direct launch to web action am: 2ef1aa5894
am: de2da206af

Change-Id: Iea7aefc5ca85f7083f37ff678933aa293694ff97

7 years agoMerge "Direct launch to web action" into nyc-mr1-dev
Todd Kennedy [Fri, 9 Sep 2016 01:59:33 +0000 (01:59 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev
am: e162563e10

Change-Id: Icafef8093cae5e4838be46d39405175b91c3bbbf

7 years agoDirect launch to web action
Todd Kennedy [Fri, 9 Sep 2016 01:59:32 +0000 (01:59 +0000)]
Direct launch to web action
am: 2ef1aa5894

Change-Id: I08a9f74e7ddb0f72881f82da40d950bf6b63e7d6

7 years agoMerge "Direct launch to web action" into nyc-mr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 01:50:07 +0000 (01:50 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev

7 years agoDirect launch to web action
Todd Kennedy [Tue, 6 Sep 2016 21:02:38 +0000 (14:02 -0700)]
Direct launch to web action

We want to be able to direct launch into the web action settings
Fixes: 31338071

Change-Id: I295729b8c9e0d3c1196ed820a9e9f6163bf611b4

7 years agoMerge "Fixed Sound Settings summary text" into nyc-mr1-dev am: 20d19a89da
Salvador Martinez [Wed, 7 Sep 2016 16:17:15 +0000 (16:17 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev am: 20d19a89da
am: 9079070347

Change-Id: Iac8b96ca2fb2dd70a854ba5fd50cf0c390d52176

7 years agoFixed Sound Settings summary text am: b706d4e956
Salvador Martinez [Wed, 7 Sep 2016 16:17:14 +0000 (16:17 +0000)]
Fixed Sound Settings summary text am: b706d4e956
am: d39c1fa395

Change-Id: I73fa598eb0067b5c1497e7bac803b9d349eaf86c

7 years agoMerge "Fixed Sound Settings summary text" into nyc-mr1-dev
Salvador Martinez [Wed, 7 Sep 2016 16:14:45 +0000 (16:14 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev
am: 20d19a89da

Change-Id: Ia991091c2bcb17c61bb0dc0fca44f26995633c69

7 years agoFixed Sound Settings summary text
Salvador Martinez [Wed, 7 Sep 2016 16:14:44 +0000 (16:14 +0000)]
Fixed Sound Settings summary text
am: b706d4e956

Change-Id: I6161e1ffbec8e17591240a0a16801afdae113fbb

7 years agoMerge "Fixed Sound Settings summary text" into nyc-mr1-dev
Salvador Martinez [Wed, 7 Sep 2016 16:06:41 +0000 (16:06 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE am: 596da67f4b -s ours
Bill Yi [Wed, 7 Sep 2016 12:06:31 +0000 (12:06 +0000)]
Import translations. DO NOT MERGE am: 596da67f4b  -s ours
am: 9f2a012fcf  -s ours

Change-Id: Ibc51db1071568435ff4429ee415c56af9d442fc8

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 7 Sep 2016 12:03:59 +0000 (12:03 +0000)]
Import translations. DO NOT MERGE
am: 596da67f4b  -s ours

Change-Id: Id618745ef778ce8c0d49cc2b917322c540f48ce4

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 7 Sep 2016 10:20:53 +0000 (03:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic79af1cb3c770ec68e0665d9885e8e189497075f
Auto-generated-cl: translation import

7 years agoFixed Sound Settings summary text
Salvador Martinez [Wed, 31 Aug 2016 21:17:35 +0000 (14:17 -0700)]
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

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:31:17 +0000 (23:31 +0000)]
[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

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a...
Andrew Sapperstein [Tue, 6 Sep 2016 23:31:17 +0000 (23:31 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: 27af0ed9e2 am: 86a4c442c1
am: 78f98e3b17

Change-Id: I567224dfe3cfe10e898bba20481f0dacbfae1532

7 years agoNull check intent before starting "learn more". am: e56d2be0b2 -s ours am: aa12cf603...
Andrew Sapperstein [Tue, 6 Sep 2016 23:31:16 +0000 (23:31 +0000)]
Null check intent before starting "learn more". am: e56d2be0b2  -s ours am: aa12cf603b am: 9177b11c8d
am: b2d898dcad

Change-Id: Iedfccf8cbc5205413b7abe9fbf4ce24df46676d8

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:28:49 +0000 (23:28 +0000)]
[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

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a...
Andrew Sapperstein [Tue, 6 Sep 2016 23:28:48 +0000 (23:28 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: 27af0ed9e2
am: 86a4c442c1

Change-Id: I77b905b00bdf012707444187d7185a77cb6d5920

7 years agoNull check intent before starting "learn more". am: e56d2be0b2 -s ours am: aa12cf603b
Andrew Sapperstein [Tue, 6 Sep 2016 23:28:47 +0000 (23:28 +0000)]
Null check intent before starting "learn more". am: e56d2be0b2  -s ours am: aa12cf603b
am: 9177b11c8d

Change-Id: I98af020a3759adaa9028ccea60eed1c552ab4339

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:27:05 +0000 (23:27 +0000)]
[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

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
Andrew Sapperstein [Tue, 6 Sep 2016 23:27:04 +0000 (23:27 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
am: c16c5ded7b

Change-Id: Ibe1018f583d8f62b9fb2a5e46bdd259dc2959c8b

7 years agoNull check intent before starting "learn more". am: e56d2be0b2
Andrew Sapperstein [Tue, 6 Sep 2016 23:27:03 +0000 (23:27 +0000)]
Null check intent before starting "learn more". am: e56d2be0b2
am: 1d20e81742  -s ours

Change-Id: I088ff330ccc963475b255fa9003d789970e34591

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:23:49 +0000 (23:23 +0000)]
[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

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
Andrew Sapperstein [Tue, 6 Sep 2016 23:23:48 +0000 (23:23 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
am: 27af0ed9e2

Change-Id: I701957dceecec49950ffab22ab6ca38f204d687e

7 years agoNull check intent before starting "learn more". am: e56d2be0b2 -s ours
Andrew Sapperstein [Tue, 6 Sep 2016 23:23:47 +0000 (23:23 +0000)]
Null check intent before starting "learn more". am: e56d2be0b2  -s ours
am: aa12cf603b

Change-Id: Ie9389929ab179aafd2066db6483ba2cebf5563ee

7 years agoRemove help links when device is not provisioned. DO NOT MERGE am: d0a95da564
Maurice Lam [Tue, 6 Sep 2016 23:23:42 +0000 (23:23 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564
am: 595cae7039

Change-Id: I4a32c4c628ce980562c115c075d05aff9b7d6769

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:22:52 +0000 (23:22 +0000)]
[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

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev
Andrew Sapperstein [Tue, 6 Sep 2016 23:22:50 +0000 (23:22 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev
am: 4e4e4ff19a

Change-Id: Ia2a0fec158a49c723cc3923baafa024aa3570c0b

7 years agoRemove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s...
Maurice Lam [Tue, 6 Sep 2016 23:21:45 +0000 (23:21 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564  -s ours am: 534fa13894 am: 9e081e0db8
am: 39390c9527

Change-Id: I5bf874a16c7939cdde5ab76728c19e199f9e8d3c

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:21:25 +0000 (23:21 +0000)]
[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

7 years agoRemove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s...
Maurice Lam [Tue, 6 Sep 2016 23:18:46 +0000 (23:18 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564  -s ours am: 534fa13894
am: 9e081e0db8

Change-Id: I84fb88a14e3c15e00a0caade542a2c0ea4902777

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:18:46 +0000 (23:18 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759
am: 746dff40ba  -s ours

Change-Id: I304081ab8e9ddaeb48af51cc07c4d3e131e7b13b

7 years agoNull check intent before starting "learn more".
Andrew Sapperstein [Tue, 6 Sep 2016 23:18:45 +0000 (23:18 +0000)]
Null check intent before starting "learn more".
am: e56d2be0b2  -s ours

Change-Id: Ia53a28a35679db7d25c15c9cc9b862da7065f68a

7 years agoRemove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s...
Maurice Lam [Tue, 6 Sep 2016 23:16:47 +0000 (23:16 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564  -s ours
am: 534fa13894

Change-Id: I6c98994b9b7629f38e7f718a8e559456ea97443c

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:14:25 +0000 (23:14 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952
am: 94a0fa5759

Change-Id: I76460eee64ad7bc84d67379dc4f952deb2232130

7 years agoRemove help links when device is not provisioned. DO NOT MERGE
Maurice Lam [Tue, 6 Sep 2016 23:14:15 +0000 (23:14 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE
am: d0a95da564  -s ours

Change-Id: Ib1a0d40efcd380ea6dc3a959770a3ce1b4e6114f

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev
Andrew Sapperstein [Tue, 6 Sep 2016 23:13:26 +0000 (23:13 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev
am: 4e4e4ff19a

Change-Id: I4d25b74d3cb8781b5f80f714d749dd59f3ec0c83

7 years agoNull check intent before starting "learn more".
Andrew Sapperstein [Tue, 6 Sep 2016 23:13:26 +0000 (23:13 +0000)]
Null check intent before starting "learn more".
am: e56d2be0b2

Change-Id: I93aa097da0b6404dfbe279ee7d678e1f83a9ec93

7 years agoRemove help links when device is not provisioned. DO NOT MERGE
Maurice Lam [Tue, 6 Sep 2016 23:12:02 +0000 (23:12 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE
am: d0a95da564

Change-Id: Ie8658b5ceb4546013f893f33301834db4a773f10

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
Maurice Lam [Tue, 6 Sep 2016 23:11:17 +0000 (23:11 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
am: d278da7952

Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Maurice Lam [Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
am: c94f2b93af

Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev
TreeHugger Robot [Tue, 6 Sep 2016 23:07:26 +0000 (23:07 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[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

7 years agoRemove help links when device is not provisioned. DO NOT MERGE
Maurice Lam [Fri, 2 Sep 2016 00:10:59 +0000 (17:10 -0700)]
Remove help links when device is not provisioned. DO NOT MERGE

Bug: 31246856
Change-Id: Id638de8ab1c6b815d62916a584892be84cabe1ae

7 years agoNull check intent before starting "learn more".
Andrew Sapperstein [Tue, 3 May 2016 01:28:21 +0000 (18:28 -0700)]
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 6561d4870f031395316cf2fc956f69c306f04ae4)

7 years agoMerge "Prompt to turn on/unlock profile before showing account sync settings" into...
Rubin Xu [Thu, 1 Sep 2016 10:52:31 +0000 (10:52 +0000)]
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev am: 95089be460
am: e0cb0dc2c8

Change-Id: Ia51c7aa3ef09f2f0780766c2b9fa515da4c8d4d9

7 years agoPrompt to turn on/unlock profile before showing account sync settings am: 3231afe95b
Rubin Xu [Thu, 1 Sep 2016 10:52:30 +0000 (10:52 +0000)]
Prompt to turn on/unlock profile before showing account sync settings am: 3231afe95b
am: e1237c8096

Change-Id: I6b1937ebeabd7f90b1571e655b654375e4ae4137

7 years agoMerge "Prompt to turn on/unlock profile before showing account sync settings" into...
Rubin Xu [Thu, 1 Sep 2016 10:48:47 +0000 (10:48 +0000)]
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev
am: 95089be460

Change-Id: I9455961b5743f4042f3984d4b868194baeca60b3

7 years agoPrompt to turn on/unlock profile before showing account sync settings
Rubin Xu [Thu, 1 Sep 2016 10:48:46 +0000 (10:48 +0000)]
Prompt to turn on/unlock profile before showing account sync settings
am: 3231afe95b

Change-Id: I4385b5c3d478028a5eabecfe23b073633e27e287

7 years agoMerge "Prompt to turn on/unlock profile before showing account sync settings" into...
Rubin Xu [Thu, 1 Sep 2016 10:41:29 +0000 (10:41 +0000)]
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6030f64a58 -s ours
Bill Yi [Thu, 1 Sep 2016 06:53:30 +0000 (06:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6030f64a58  -s ours
am: 3e3da9b35b  -s ours

Change-Id: I858a80ddd045dffa41782832a3032120e716b169

7 years agoImport translations. DO NOT MERGE am: 3afce04bf8 -s ours
Bill Yi [Thu, 1 Sep 2016 06:53:29 +0000 (06:53 +0000)]
Import translations. DO NOT MERGE am: 3afce04bf8  -s ours
am: 9538f83c79  -s ours

Change-Id: Ief9b13d93e420fd6e39b714b3ce42badc0e4a856

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 1 Sep 2016 06:45:28 +0000 (06:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 6030f64a58  -s ours

Change-Id: Ib9c3da80b8e9ed49d7d765299a0ff53d345f0cc9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Sep 2016 06:45:27 +0000 (06:45 +0000)]
Import translations. DO NOT MERGE
am: 3afce04bf8  -s ours

Change-Id: Ieacfa08b8f57ca01709324331f52b74c3cb80dfc

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 1 Sep 2016 06:36:19 +0000 (06:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Sep 2016 04:56:25 +0000 (21:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I97dae1e7f6b416d7a676e9c2c76942f6ada9582a
Auto-generated-cl: translation import

7 years agoFix NullPointerException when refreshing wifi preferences. am: b8011dbb93
Doris Ling [Thu, 1 Sep 2016 00:11:03 +0000 (00:11 +0000)]
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93
am: 5ec9ffe86a

Change-Id: I6167e98e58ac004a7e2bf4a76af226df9992b4ec

7 years agoFix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88...
Doris Ling [Thu, 1 Sep 2016 00:08:17 +0000 (00:08 +0000)]
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912 am: e972a23faf
am: e3f9654ebc

Change-Id: I48da5c628897cb92f47525772fbfa2ee78929f61

7 years agoFix NullPointerException when refreshing wifi preferences.
Doris Ling [Thu, 1 Sep 2016 00:07:21 +0000 (00:07 +0000)]
Fix NullPointerException when refreshing wifi preferences.
am: b8011dbb93

Change-Id: I026cfeb1948394f31e3e39a344ee48dd6bca50b8

7 years agoFix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912
Doris Ling [Thu, 1 Sep 2016 00:05:04 +0000 (00:05 +0000)]
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912
am: e972a23faf

Change-Id: I60efde4b22dad901c491dc4ce7585c698047420b

7 years agoFix NullPointerException when refreshing wifi preferences. am: b8011dbb93
Doris Ling [Thu, 1 Sep 2016 00:02:02 +0000 (00:02 +0000)]
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93
am: 7a15f88912

Change-Id: I3b04d4d87063f928fa76b4843ca0692c8d0311cb

7 years agoFix NullPointerException when refreshing wifi preferences.
Doris Ling [Wed, 31 Aug 2016 23:59:08 +0000 (23:59 +0000)]
Fix NullPointerException when refreshing wifi preferences.
am: b8011dbb93

Change-Id: Ib77f937b79813351594037eaa424fac33995f336

7 years agoFix NullPointerException when refreshing wifi preferences.
Doris Ling [Wed, 31 Aug 2016 21:27:19 +0000 (14:27 -0700)]
Fix NullPointerException when refreshing wifi preferences.

AccessPointPreference.refresh() is being called in different threads.
The refresh of the preference should only be updated in the main thread.
When access point updates is received not in the main thread, will post
the refreshing of the preference to the message queue to make the update
on the UI thread.

Test: auto - run monkey to verify there is no ANR or crash
      manual - go to Settings->Wifi, toggle on/off many times and verify
      there is no crash.

Change-Id: I656a70ecf2e7b9446c7b95b6b42ab19a5cc2e51c
Fixes: 30902893

7 years agoMerge "Make sure setting switch bar state is announced." into nyc-mr1-dev am: e954b992d8
Phil Weaver [Wed, 31 Aug 2016 21:38:26 +0000 (21:38 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev am: e954b992d8
am: caa37ab1db

Change-Id: I29db443dca08c53aa080f81d66f21df4218ac11c

7 years agoMake sure setting switch bar state is announced. am: 664f6dacca
Phil Weaver [Wed, 31 Aug 2016 21:38:26 +0000 (21:38 +0000)]
Make sure setting switch bar state is announced. am: 664f6dacca
am: d8c8c632d4

Change-Id: I8eceb0ed685ec5101132027f547c0b577c8c459c

7 years agoMerge "Make sure setting switch bar state is announced." into nyc-mr1-dev
Phil Weaver [Wed, 31 Aug 2016 21:34:53 +0000 (21:34 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev
am: e954b992d8

Change-Id: Ib39605af8243f105c94909cf0b1aa5c3680250a0

7 years agoMake sure setting switch bar state is announced.
Phil Weaver [Wed, 31 Aug 2016 21:34:53 +0000 (21:34 +0000)]
Make sure setting switch bar state is announced.
am: 664f6dacca

Change-Id: I8ecc83b5affa7af17071971abee57320d1fe2333

7 years agoMerge "Make sure setting switch bar state is announced." into nyc-mr1-dev
Phil Weaver [Wed, 31 Aug 2016 21:32:07 +0000 (21:32 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev

7 years agoMerge "TetherSettings: check provisionApp array length" into nyc-mr1-dev am: 3756593811
Rebecca Silberstein [Wed, 31 Aug 2016 20:51:32 +0000 (20:51 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev am: 3756593811
am: 2651bdcfd7

Change-Id: I7245009917e42a9fe3d7f0eceace4ad28d2eb398

7 years agoTetherSettings: check provisionApp array length am: 39f0e41ec7
Rebecca Silberstein [Wed, 31 Aug 2016 20:51:31 +0000 (20:51 +0000)]
TetherSettings: check provisionApp array length am: 39f0e41ec7
am: 02602b9b2c

Change-Id: I51d5a3094a575254489d734c823e10608ddb369b

7 years agoMerge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
Rebecca Silberstein [Wed, 31 Aug 2016 20:45:21 +0000 (20:45 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
am: 3756593811

Change-Id: Iaa61a5d18148e721987df8fb1d76745b315daa85

7 years agoTetherSettings: check provisionApp array length
Rebecca Silberstein [Wed, 31 Aug 2016 20:45:21 +0000 (20:45 +0000)]
TetherSettings: check provisionApp array length
am: 39f0e41ec7

Change-Id: I25e14b85e810e9423e8c89d8449e2826acb77e74

7 years agoMerge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
Rebecca Silberstein [Wed, 31 Aug 2016 20:28:56 +0000 (20:28 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev

7 years agoMerge "Implement Web Action settings" into nyc-mr1-dev am: 1721e4510f
Todd Kennedy [Wed, 31 Aug 2016 02:28:38 +0000 (02:28 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev am: 1721e4510f
am: 5674358df2

Change-Id: Ief4abbfd95bedee1826740a46d1996771687aef4

7 years agoImplement Web Action settings am: d5824967ee
Todd Kennedy [Wed, 31 Aug 2016 02:28:38 +0000 (02:28 +0000)]
Implement Web Action settings am: d5824967ee
am: 1fc2e5dcb7

Change-Id: I4e4976e848af3e8d12b65730147be1257fed382c

7 years agoMerge "Implement Web Action settings" into nyc-mr1-dev
Todd Kennedy [Wed, 31 Aug 2016 02:25:37 +0000 (02:25 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev
am: 1721e4510f

Change-Id: Ib0e0a234b0dcc3fbd6a3602977d744629b31a0ca

7 years agoImplement Web Action settings
Todd Kennedy [Wed, 31 Aug 2016 02:25:37 +0000 (02:25 +0000)]
Implement Web Action settings
am: d5824967ee

Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5

7 years agoMerge "Implement Web Action settings" into nyc-mr1-dev
TreeHugger Robot [Wed, 31 Aug 2016 02:20:47 +0000 (02:20 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev

7 years agoMerge "Can restore state on rotate personal dict screen" into nyc-mr1-dev am: adfcb15518
Salvador Martinez [Wed, 31 Aug 2016 00:45:30 +0000 (00:45 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev am: adfcb15518
am: 6584b76a87

Change-Id: I48ae580a4c8d96aa479bb526a3555f062cbfe4a3

7 years agoCan restore state on rotate personal dict screen am: 8f4eb4d74b
Salvador Martinez [Wed, 31 Aug 2016 00:45:29 +0000 (00:45 +0000)]
Can restore state on rotate personal dict screen am: 8f4eb4d74b
am: 45cdbd2669

Change-Id: I03d263ec9747dab3a658362e6e58370d28c92101

7 years agoMerge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
Salvador Martinez [Wed, 31 Aug 2016 00:43:06 +0000 (00:43 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
am: adfcb15518

Change-Id: I968eb6945d2c276f6b7590125b50c7d48671798c