Commit Graph

5163 Commits

Author SHA1 Message Date
Ajay Nadathur
b9c3eb954a Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am: 0ed0319005

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
2017-08-09 20:27:45 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00
Adrian Roos
1d192addc6 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
am: a147d4a616

Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
2017-08-09 13:55:00 +00:00
TreeHugger Robot
a147d4a616 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev 2017-08-09 13:36:40 +00:00
Adrian Roos
6600ddec73 FRP: Add dedicated explanation strings for ConfirmCredential
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes: 63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
2017-08-09 11:08:13 +00:00
Eric Schwarzenbach
06917056fd Merge "Add modify string to resources." into oc-mr1-dev
am: 9e47d2c233

Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68
2017-08-09 01:04:33 +00:00
TreeHugger Robot
9e47d2c233 Merge "Add modify string to resources." into oc-mr1-dev 2017-08-09 00:46:57 +00:00
Eric Schwarzenbach
b82f51099a Add modify string to resources.
Bug: 36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
2017-08-08 14:11:51 -07:00
Alison Cichowlas
f65c06cf37 Merge "Add new strings for b/63109928" into oc-mr1-dev
am: 4068fe7d38

Change-Id: I23f34a35cea64a8f599f3dca2c9a65b8b85d05b1
2017-08-08 19:50:50 +00:00
Alison Cichowlas
3f9d0f1614 Add new strings for b/63109928
Test: Strings only; manual
Bug: 63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
2017-08-08 11:05:23 -04:00
Fan Zhang
1f6f8e1010 Merge "Misc tweaks in settings" into oc-mr1-dev
am: 2c9e62ab0e

Change-Id: I67f8000451a584f96beb286c57d731d2241e9899
2017-08-04 20:27:34 +00:00
TreeHugger Robot
2c9e62ab0e Merge "Misc tweaks in settings" into oc-mr1-dev 2017-08-04 20:16:36 +00:00
Fan Zhang
8722509eb9 Misc tweaks in settings
- Tweak layout for default sms picker icon. Now icons are aligned
  and forced to be in the same size
- Update string to use correct double-quote symbol
- Multiline title for some user & account setting

Change-Id: I27c1ed6459c5cd919778d535ab846b148a3f91b6
Fixes: 64285520
Fixes: 62891178
Fixes: 62265094
Fixes: 64363209
Test: robotests
Test: visual
2017-08-04 10:42:27 -07:00
Malcolm Chen
1e63581edb Merge "In the Data usage subtext, remove the word between." into oc-mr1-dev
am: e84e1f1b03

Change-Id: I110e04817b16c1b23f33e646e705c7fbdd9b9adb
2017-08-04 03:13:50 +00:00
TreeHugger Robot
e84e1f1b03 Merge "In the “Data usage” subtext, remove the word “between”." into oc-mr1-dev 2017-08-04 03:05:21 +00:00
Ajay Nadathur
48da03e6cd Add 'clear' button to pin/password lock screen
am: be2246bee7

Change-Id: I21c6c68199c281fbdb3ac97fd50f06bd612173dc
2017-08-03 20:40:06 +00:00
Ajay Nadathur
be2246bee7 Add 'clear' button to pin/password lock screen
bug: 62904466
Test: Manually tested, added functional tests
Change-Id: I5f5555d99b47550a8fef6995222d12155b4072a9
2017-08-03 17:46:51 +00:00
Malcolm Chen
33005caf42 In the “Data usage” subtext, remove the word “between”.
Bug: 64072976
Test: manual
Change-Id: I8720f0cf84270d2e8b50547188e48478b889ec81
2017-08-01 15:55:32 -07:00
Meng Wang
7a801228f6 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
am: 1ae2573bb5

Change-Id: I622a7851b1cff523633d62727f437651627883d3
2017-08-01 20:55:13 +00:00
Meng Wang
1ae2573bb5 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev 2017-08-01 20:37:37 +00:00
Meng Wang
36b430e1fa Rephrase emergency_address_summary to remove '911'
Because it's not easy to translate 911 per country.

Fixes: 64226955
Test: manual
Change-Id: Ibe052090f8d33a1f3f49150fb9c0c1cc2ffb947f
2017-08-01 09:36:34 -07:00
Jeff Davidson
6f95de16b5 Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
am: cebb6a4f9c

Change-Id: I083d1356461b78dec175a770643a1d52949f93e4
2017-08-01 02:35:01 +00:00
Jeff Davidson
470c87cfea Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am: cd4fbd90e7

Change-Id: Id37f4182ed523bbf263d6eb6c1517bbbfabf0ca4
2017-08-01 02:32:04 +00:00
Jeff Davidson
cebb6a4f9c Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am: cd4fbd90e7

Change-Id: I65f2baef41c86ebcc4d6f427fa806441123621f0
2017-08-01 02:32:04 +00:00
TreeHugger Robot
cd4fbd90e7 Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev 2017-08-01 02:25:02 +00:00
Ajay Nadathur
40c652b221 Merge "Change vision settings suggestion title" into oc-mr1-dev
am: 9b89fb0080

Change-Id: I76719d69ebf0fa79e047da425de297422693f512
2017-07-31 18:30:57 +00:00
Ajay Nadathur
9b89fb0080 Merge "Change vision settings suggestion title" into oc-mr1-dev 2017-07-31 18:19:12 +00:00
Pankaj Kanwar
99dc2bf58e Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
am: 492c9f4d16

Change-Id: I3d05092be28d9fc527e882464e117837242143b3
2017-07-31 17:13:22 +00:00
pkanwar
186c9b4525 Add string needed to support carrier wifi in UI.
Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.

Bug:30988281
Test: manual
Change-Id: I6f3b6a047bb28fddf81ed967c89fac5824d34f9f
2017-07-28 23:00:32 +00:00
Ajay Nadathur
5224edfb92 Change vision settings suggestion title
bug: 63867327
Test: Manually tested and verified
Change-Id: I358508534d0ef77c99851430f979b61702519313
2017-07-28 22:01:09 +00:00
Ajay Nadathur
4f27a4de98 Merge "Update text for lock screen notifications" into oc-mr1-dev
am: d2352cdd08

Change-Id: Id8f23cc08b481405c82318972107e283035816a7
2017-07-28 17:51:03 +00:00
Ajay Nadathur
d2352cdd08 Merge "Update text for lock screen notifications" into oc-mr1-dev 2017-07-28 17:45:00 +00:00
Ryusuke Sawa
653ef15253 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f am: 6b46a9df49
am: 775c1c8eb5

Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
2017-07-27 18:28:17 +00:00
Ryusuke Sawa
775c1c8eb5 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f
am: 6b46a9df49

Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
2017-07-27 18:26:18 +00:00
Ryusuke Sawa
b0e008841f Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
2017-07-27 18:21:19 +00:00
Julia Reynolds
d6ab7dee09 Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5

Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
2017-07-27 12:43:21 +00:00
TreeHugger Robot
4b8f2c9ad5 Merge "Revert string change" into oc-dr1-dev 2017-07-27 12:36:55 +00:00
Ryusuke Sawa
a15be47bd5 Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
Jeff Davidson
a0b8472c4d Remove eSIM reset checkbox and always perform the reset.
Due to substantial risk in landing the "retain profiles" flow that
would otherwise occur if the user elected not to wipe eSIM profiles
during a factory reset, we no longer expose this option to users
through the UI. Instead, we show affected users messaging indicating
that their eSIM will be wiped unconditionally.

The underlying plumbing is retained to keep the change small and to
make it easier to revert back to a checkbox when the rest of the
platform supports it.

Change-Id: Ida7df14d81ffc4cb6b4b414928d3ce7e5c78594b
Fixes: 64081853
Test: TreeHugger
2017-07-27 01:05:02 +00:00
Ajay Nadathur
cfc78d7d7c Update text for lock screen notifications
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 00:38:14 +00:00
TreeHugger Robot
34d30267e3 Merge "Update misc strings" into oc-mr1-dev 2017-07-26 04:59:29 +00:00
Fan Zhang
325d28ae6c Update misc strings
Change-Id: I566e2d08488e8468b9b943418d05fb2d6f669638
Fix: 62069132
Fix: 62265094
Test: visual
2017-07-25 13:40:37 -07:00
Julia Reynolds
e7f99fb9e3 Revert string change
Test: manual
Change-Id: I3f38ac68ae6b9fc225c92bdfcc0f79859ff8dfa1
Fixes: 63906381
2017-07-25 14:46:10 -04:00
Fan Zhang
358d30f093 Update string for bluetooth device visibility
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix: 62891178
Test: visual
Test: robotests
2017-07-24 18:40:59 +00:00
Andrew Sapperstein
ebd8308698 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77

Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
2017-07-22 00:33:13 +00:00
TreeHugger Robot
59a66d9b77 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev 2017-07-22 00:28:31 +00:00
Andrew Sapperstein
64590ec7a6 Add help uri for process stats summary and apps.
Bug: 62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
2017-07-21 15:01:55 -07:00
Doris Ling
a39daa25e7 Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev 2017-07-21 17:19:12 +00:00
Julia Reynolds
4faa353f02 Zen settings screen update
am: 56b748d686

Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e
2017-07-21 16:21:25 +00:00
Julia Reynolds
56b748d686 Zen settings screen update
- Remove app attribution
- Change visual disturbances label

Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual
2017-07-21 09:11:14 -04:00