Commit Graph

13125 Commits

Author SHA1 Message Date
TreeHugger Robot
d0b09f7868 Merge "Remove code for old wifi tether feature" 2017-08-10 00:08:03 +00:00
Jayachandran C
4b2f10ed3c Do not translate "Wi-Fi calling" for VF DE
Test: Validated it by mimicking using T-Mobile SIM

Bug: 64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26
2017-08-09 16:52:42 -07: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
TreeHugger Robot
882d35715e Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-09 16:46:44 +00:00
Oren Blasberg
ab861c64a0 Merge "Update SMS mirroring icon to new style." into oc-mr1-dev am: a3a0a1e2e8
am: aaf5b20eb1

Change-Id: Ib61b9481ec9c102d17d2f75b4832948807fe487a
2017-08-09 16:14:36 +00:00
Oren Blasberg
aaf5b20eb1 Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
am: a3a0a1e2e8

Change-Id: I9de7aeaa4e81b969c40e137125777f8eb7274152
2017-08-09 16:06:02 +00:00
TreeHugger Robot
a3a0a1e2e8 Merge "Update SMS mirroring icon to new style." into oc-mr1-dev 2017-08-09 15:54:19 +00:00
TreeHugger Robot
b2d8490250 Merge "Import translations. DO NOT MERGE" 2017-08-09 15:46:22 +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
Winston Man
a266a2a0c0 Merge "Move work notification settings back to bottom" into oc-mr1-dev
am: 466adba25e

Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
2017-08-09 09:19:43 +00:00
Winston Man
466adba25e Merge "Move work notification settings back to bottom" into oc-mr1-dev 2017-08-09 09:09:35 +00:00
The Android Open Source Project
1d05244fc2 Import translations. DO NOT MERGE
Change-Id: I5d4e5680aca99f0d47353175e796b0b3a0116598
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:20:51 -07: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
The Android Open Source Project
8008408285 Import translations. DO NOT MERGE
Change-Id: I7c03ce57550b6618594ff59a6cb82d5871207216
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:14:31 -07:00
The Android Open Source Project
ad70f5acce Import translations. DO NOT MERGE
Change-Id: Ie7b187e5540b995700b187de4c58808727ce68b4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:07:56 -07: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
Oren Blasberg
9705aad8db Update SMS mirroring icon to new style.
Test: Verified the icon looks good in Settings.

Bug: 37546615
Change-Id: I313548022fa37676bc0dfee598d45e9f09d5bfb5
2017-08-08 13:49:48 -07:00
Oren Blasberg
3e7613546a Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev am: 101f3d2e44
am: 7f5407e6c9

Change-Id: I02d6c08efd9df3a5e6815af48136eb03c31072d6
2017-08-08 20:12:20 +00:00
Oren Blasberg
7f5407e6c9 Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
am: 101f3d2e44

Change-Id: If2e2c15f2672bac1250783376c102b9bda6e1156
2017-08-08 20:07:55 +00: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
TreeHugger Robot
101f3d2e44 Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev 2017-08-08 20:02:42 +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
Winston Man
c603a99ba4 Move work notification settings back to bottom
- Settings order now matches
- screenshot with work profile: https://hsv.googleplex.com/5742195667632128
- screenshot without work profile: https://hsv.googleplex.com/5683485175971840

Bug: 64436619
Test: RunSettingsRoboTests; manual

Merged-In: Ia665ee5295981e11193e69585232874d1dddba23

Change-Id: Ia665ee5295981e11193e69585232874d1dddba23
2017-08-08 16:17:12 +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
Winston Man
0372e3f258 Move work notification settings back to bottom
- Settings order now matches
- screenshot with work profile: https://hsv.googleplex.com/5742195667632128
- screenshot without work profile: https://hsv.googleplex.com/5683485175971840

Bug: 64436619
Test: RunSettingsRoboTests; manual

Change-Id: Ia665ee5295981e11193e69585232874d1dddba23
2017-08-08 14:58:21 +01:00
Bill Yi
c89d5b0093 Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Bill Yi
57c8508960 Import translations. DO NOT MERGE
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 19:27:58 -07:00
Bill Yi
8cdf71313d Import translations. DO NOT MERGE
Change-Id: I7b239876604bd4f172b8b7af2e0d9307f6b2217d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-04 17:04:36 -07:00
Fan Zhang
bbe2ac7b2d Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev am: 4c84a61581
am: 9d8924bce3

Change-Id: I95236cac5dc3478be2bda283520a0eb53ce609b6
2017-08-04 22:53:49 +00:00
Fan Zhang
9d8924bce3 Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
am: 4c84a61581

Change-Id: I2ffd5f2bd7fd2c58c8417a6971e53f4b2207b235
2017-08-04 22:45:08 +00:00
TreeHugger Robot
4c84a61581 Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev 2017-08-04 22:36:57 +00: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
7686ef863c Misc tweak on wifi hotspot setting page
- Make hotspot password show in plain text
- Make main control into a master switch style

Change-Id: I8fdb293a617787f256fb663708cfc0e454f548d2
Fixes: 63865785
Test: robotests
2017-08-03 16:23:27 -07: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