Commit Graph

27511 Commits

Author SHA1 Message Date
Salvador Martinez
d39c1fa395 Fixed Sound Settings summary text
am: b706d4e956

Change-Id: I6161e1ffbec8e17591240a0a16801afdae113fbb
2016-09-07 16:14:44 +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
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
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
Doris Ling
7a15f88912 Fix NullPointerException when refreshing wifi preferences.
am: b8011dbb93

Change-Id: Ib77f937b79813351594037eaa424fac33995f336
2016-08-31 23:59:08 +00:00
Doris Ling
b8011dbb93 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
2016-08-31 22:19:19 +00:00
Phil Weaver
caa37ab1db Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev
am: e954b992d8

Change-Id: Ib39605af8243f105c94909cf0b1aa5c3680250a0
2016-08-31 21:34:53 +00:00
Phil Weaver
d8c8c632d4 Make sure setting switch bar state is announced.
am: 664f6dacca

Change-Id: I8ecc83b5affa7af17071971abee57320d1fe2333
2016-08-31 21:34:53 +00:00
Phil Weaver
e954b992d8 Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev 2016-08-31 21:32:08 +00:00
Rebecca Silberstein
2651bdcfd7 Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
am: 3756593811

Change-Id: Iaa61a5d18148e721987df8fb1d76745b315daa85
2016-08-31 20:45:21 +00:00
Rebecca Silberstein
02602b9b2c TetherSettings: check provisionApp array length
am: 39f0e41ec7

Change-Id: I25e14b85e810e9423e8c89d8449e2826acb77e74
2016-08-31 20:45:21 +00:00
Rebecca Silberstein
3756593811 Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev 2016-08-31 20:28:56 +00:00
Todd Kennedy
5674358df2 Merge "Implement Web Action settings" into nyc-mr1-dev
am: 1721e4510f

Change-Id: Ib0e0a234b0dcc3fbd6a3602977d744629b31a0ca
2016-08-31 02:25:37 +00:00
Todd Kennedy
1fc2e5dcb7 Implement Web Action settings
am: d5824967ee

Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5
2016-08-31 02:25:37 +00:00
TreeHugger Robot
1721e4510f Merge "Implement Web Action settings" into nyc-mr1-dev 2016-08-31 02:20:47 +00:00
Salvador Martinez
6584b76a87 Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
am: adfcb15518

Change-Id: I968eb6945d2c276f6b7590125b50c7d48671798c
2016-08-31 00:43:06 +00:00
Salvador Martinez
45cdbd2669 Can restore state on rotate personal dict screen
am: 8f4eb4d74b

Change-Id: I8e4a2a29474784e60eb41b356cac65fe5b86886c
2016-08-31 00:43:06 +00:00
Salvador Martinez
adfcb15518 Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev 2016-08-31 00:38:15 +00:00
Andrew Sapperstein
f6908339fd Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am: a200918af0
am: 65a8409ddc

Change-Id: I11631880866d49e4a69869b375779aab2c472f68
2016-08-31 00:34:45 +00:00
Andrew Sapperstein
c3733b8653 Use LinkTextView for support disclaimer text. am: 7e9146950d
am: d63e187b1a

Change-Id: Iffd7cc56eb9ee612b8c86a668f4851f229b746ac
2016-08-31 00:34:45 +00:00
Andrew Sapperstein
65a8409ddc Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
am: a200918af0

Change-Id: I7554d650756aad063d8cf091022fb2a04f823b81
2016-08-31 00:28:27 +00:00