Commit Graph

5692 Commits

Author SHA1 Message Date
Ajay Nadathur
58c2da2d9e Update strings for skip fingerprint setup
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
Joachim Sauer
8a739a4bd1 Merge "Implement auto 12/24h setting toggle." 2017-08-10 16:36:47 +00:00
Joachim Sauer
95beae0089 Implement auto 12/24h setting toggle.
This implements an explicit toggle to enable/disable automatic 12h/24h
time formatting detection based on the current locale.

Previously automatic detection was the norm on a freshly wiped device,
but could never be re-enabled once either 12h or 24h format was
configured.

Bug: 32761619
Test: m RunSettingsRoboTests
Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7
2017-08-10 13:32:17 +01:00
Fan Zhang
17cfd9f500 Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am: 0dc85bcc1e
am: 1e61f91d7b

Change-Id: I5610152c59889196124ff728e2607de764047e08
2017-08-10 02:31:39 +00:00
Ajay Nadathur
3253b7ee7c Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
am: b9c3eb954a

Change-Id: Ie7d1d6bd37274ac70c87fc6b8dca5f3118a64a64
2017-08-10 02:20:25 +00:00
Fan Zhang
1e61f91d7b Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
am: 0dc85bcc1e

Change-Id: I3942d07dd5c0acd5640ad50b7311ba15177f5a6d
2017-08-10 00:44:59 +00:00
TreeHugger Robot
d0b09f7868 Merge "Remove code for old wifi tether feature" 2017-08-10 00:08:03 +00:00
Fan Zhang
3fc194017d Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes: 64342027
Test: visual
2017-08-09 13:57:37 -07:00
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
d3c5da9e18 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev am: a147d4a616
am: 1d192addc6

Change-Id: I1f349fbaad0c6807f1e3dccf30fe47b6c48d3eec
2017-08-09 14:18:21 +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
f89bbc5fce Merge "Add modify string to resources." into oc-mr1-dev am: 9e47d2c233
am: 06917056fd

Change-Id: Ie464ce313d3145b804e53420033a2d705589344f
2017-08-09 01:18:26 +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
aa62c4f1c7 Merge "Add new strings for b/63109928" into oc-mr1-dev am: 4068fe7d38
am: f65c06cf37

Change-Id: I4706e56b885ce01c272d4e582c1b80ce9bfba766
2017-08-08 20:03:30 +00: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
68405546ca Merge "Misc tweaks in settings" into oc-mr1-dev am: 2c9e62ab0e
am: 1f6f8e1010

Change-Id: Id499568055171b25ed552c45042d877821e6b114
2017-08-04 20:32:02 +00: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
TreeHugger Robot
6c753e8847 Merge "Clean up styles and delete unused layout for action buttons" 2017-08-04 17:58:37 +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
1acbee786b Merge "In the Data usage subtext, remove the word between." into oc-mr1-dev am: e84e1f1b03
am: 1e63581edb

Change-Id: I8eda7cab1a700bc766a16eb0ab2b3839e506a51b
2017-08-04 03:19:51 +00: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
Fan Zhang
797d2e126a Clean up styles and delete unused layout for action buttons
Change-Id: I65725b4ea04087b582a08497fd838d14e834b47a
Fixes: 63991885
Test: robotest and visual
2017-08-03 16:16:18 -07:00
Ajay Nadathur
07bb00714a Add 'clear' button to pin/password lock screen am: be2246bee7
am: 48da03e6cd

Change-Id: Ic70f8452eed63e3fc9e7c8f255e15783e3e06448
2017-08-03 20:45:52 +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
TreeHugger Robot
89a8d6afb8 Merge "Delete unused classes" 2017-08-02 18:58:51 +00:00
Fan Zhang
2fa45c92e6 Delete unused classes
Change-Id: I014136b02ffc7f4d10ac450c9583b883c84d22a1
Fix: 32700131
Test: rerun robotest
2017-08-01 17:59:34 -07:00
Fan Zhang
defb1183ec Remove code for old wifi tether feature
Change-Id: If92798ddf075801e66cd97ecacff2f8df1e41985
Fix: 64032458
Test: rerun robotests
2017-08-01 16:18:24 -07: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
1343c78445 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev am: 1ae2573bb5
am: 7a801228f6

Change-Id: I16426bc3253e3852976890ffb62e33c6e4e5ed65
2017-08-01 21:20:52 +00: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
03c29c8089 Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7 am: cebb6a4f9c
am: 6f95de16b5

Change-Id: I7f486df805f9b6724cf8b0f432745e8024b4ea26
2017-08-01 03:07:44 +00: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
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
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
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
0724a106fe Merge "Change vision settings suggestion title" into oc-mr1-dev am: 9b89fb0080
am: 40c652b221

Change-Id: Ib966fa27205c8f07dafa02b8dcb61b37b99667fc
2017-07-31 18:34:29 +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
2ce583e934 Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev am: 492c9f4d16
am: 99dc2bf58e

Change-Id: I7ee1f292f89cf4a66e8813ac8ea7e3a2804d9310
2017-07-31 17:16:21 +00:00