Alison Cichowlas
3e5c6f718a
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev am: 49d25a0506
...
am: 4010eb294f
2017-08-31 20:23:27 +00:00
Alison Cichowlas
4010eb294f
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
...
am: 49d25a0506
2017-08-31 20:10:19 +00:00
TreeHugger Robot
69ad36d628
Merge "Modify notification string."
2017-08-29 17:59:32 +00:00
yuemingw
6b6d9fd979
Modify notification string.
...
Bug: 30432840
Test: Reproduced the problem by clicking 'Install from SD card' and the
new notification string appears instead of the old one.
Change-Id: I38a6fc6212aa283f8a899c28db81d8dae4245396
2017-08-29 14:06:31 +01:00
Maurice Lam
be1bc679c2
Fix typo in fingerprint string
...
Test: Manual
Bug: 65017285
Change-Id: I3664cc4b888c4c573b439f06f1ef9983d0470674
2017-08-24 19:40:30 +00:00
Alison Cichowlas
c3570914f6
Legacy channels say "allow sound" instead of "let the app decide".
...
We had this string already translated from use in previous ux revs.
Change-Id: I91a9ce001a0d875c0ae12643e6b386328e9cd8de
Fixes: 62873496
Test: String change, manually verified
2017-08-24 15:02:21 -04:00
Tony Mak
35efb10206
Merge "A separate entry for work profile CA cert" into oc-mr1-dev am: e040ef4a39
...
am: 237e49a7c9
2017-08-22 18:24:05 +00:00
Tony Mak
237e49a7c9
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
...
am: e040ef4a39
2017-08-22 18:21:35 +00:00
Tony Mak
c74bbcd3b2
A separate entry for work profile CA cert
...
We mixed both primary and work profile CA certs into single entry
previously which is not aligned with the CTS requirement.
Separate them from now.
Test: m -j RoboSettingsTest
Test: Run related manual test in CtsVerifier
Bug: 64567417
Change-Id: Iaff2d9f25ef15b96c11727e7075bdae8e90ec8ce
2017-08-22 18:24:30 +01:00
Maurice Lam
6c108ca693
Merge "Use default primary color for choose lock screens" into oc-mr1-dev am: 595627c630
...
am: 4db65eab00
2017-08-16 22:10:01 +00:00
Fan Zhang
0654a22578
Merge "Stub out feature flag UI"
2017-08-16 20:27:14 +00:00
Maurice Lam
4db65eab00
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
...
am: 595627c630
2017-08-16 18:30:22 +00:00
Maurice Lam
2c43d273b8
Merge "Update strings for screen lock setup"
2017-08-16 17:40:52 +00:00
Maurice Lam
e9a6e8f1e5
Use default primary color for choose lock screens
...
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.
Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
2017-08-15 19:30:14 -07:00
Fan Zhang
75cd1d2010
Stub out feature flag UI
...
Bug: 36222960
Test: make -j40 RunSettingsRoboTests
Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53
2017-08-15 17:42:58 -07:00
Jesse Evans
51a13df33a
Merge "Change strings from Instant app account to setting" into oc-mr1-dev am: 858ea46a3a
...
am: eee0e82fba
2017-08-15 02:43:00 +00:00
Jesse Evans
eee0e82fba
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
...
am: 858ea46a3a
2017-08-15 01:37:07 +00:00
Maurice Lam
841288144c
Update strings for screen lock setup
...
Manual cherry pick of 3eb4c8333e
2017-08-14 22:45:30 +00:00
Jesse Evans
804b0daf49
Change strings from Instant app account to setting
...
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2
Update strings for screen lock setup
...
am: 3eb4c8333e
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e
Update strings for screen lock setup
...
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
Ajay Nadathur
2c2d41f8e9
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
...
am: aec29ee4be
2017-08-11 17:25:31 +00:00
Ajay Nadathur
aec29ee4be
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
...
am: 719d80e6e0
2017-08-11 17:21:24 +00:00
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
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
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
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
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
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
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
2017-08-09 01:18:26 +00:00
Eric Schwarzenbach
06917056fd
Merge "Add modify string to resources." into oc-mr1-dev
...
am: 9e47d2c233
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
2017-08-08 20:03:30 +00:00
Alison Cichowlas
f65c06cf37
Merge "Add new strings for b/63109928" into oc-mr1-dev
...
am: 4068fe7d38
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
2017-08-04 20:32:02 +00:00
Fan Zhang
1f6f8e1010
Merge "Misc tweaks in settings" into oc-mr1-dev
...
am: 2c9e62ab0e
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
2017-08-04 03:19:51 +00:00
