Maurice Lam
4db65eab00
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
...
am: 595627c630
Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4
2017-08-16 18:30:22 +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
Jesse Evans
eee0e82fba
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
...
am: 858ea46a3a
Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd
2017-08-15 01:37:07 +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
Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4
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
aec29ee4be
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
...
am: 719d80e6e0
Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
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
Jayachandran Chinnakkannu
eddeef3b0e
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 9476e824be
...
am: 7398553a81
Change-Id: Ib1f0f6349ad278f4db4da83fe2149215dd3c06ce
2017-08-10 06:14:27 +00:00
Jayachandran Chinnakkannu
7398553a81
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
...
am: 9476e824be
Change-Id: I584d95282cc7c5f681fd6bc5ac4c0f03ad22053c
2017-08-10 06:04:37 +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
0dc85bcc1e
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
2017-08-10 00:38:43 +00:00
Fan Zhang
a8f7f745e1
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
...
am: 5b820431d3
Change-Id: I269323c219ccd8e5d343b62bfbc6160959f5340f
2017-08-10 00:37:34 +00:00
Fan Zhang
e3535d9998
Delete DynamicindexableContentMonitor & all refs to it
...
Convert input device search into a search query loader
And remove old logic from DynamicIndexableContentMonitor
Change-Id: If652b1ea7c8add9185bbd025055e14925d3a8eec
Bug: 64310452
Bug: 63831980
Test: robotests
2017-08-09 17:27:02 -07: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
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
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
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
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
7f5407e6c9
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
...
am: 101f3d2e44
Change-Id: If2e2c15f2672bac1250783376c102b9bda6e1156
2017-08-08 20:07:55 +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
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
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
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
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
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
Ajay Nadathur
1f2317c4b4
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
...
am: 1908c4010b
Change-Id: I949aa81a0a88be0824590d85a50400b1b1268d3f
2017-08-03 16:51:06 +00:00