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
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
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
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
Fan Zhang
2d28a4ceb4
Unify action buttons to a common widget (part 1)
...
- Create a preference type to host action button preferences.
- Convert app battery usage page to use the new preference
- Convert wifi detail page to use the new preference
Change-Id: I60bc473986ab46f2897e2537eb0e013fa813a4fc
Fix: 63991885
Test: robotests
2017-07-28 01:00:39 +00:00
TreeHugger Robot
6e4ebc3b74
Merge "Update text for lock screen notifications"
2017-07-27 21:03:42 +00:00
Maurice Lam
0b71195dd0
Merge "Raise CHAR LIMIT and update description"
2017-07-27 18:45:25 +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
Ajay Nadathur
05fcf3baf2
Update text for lock screen notifications
...
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 17:43:24 +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
Maurice Lam
f88a617468
Raise CHAR LIMIT and update description
...
Raise header CHAR LIMIT to 40, and update the description to tell
translators to translate "Set fingerprint backup" if the translation
cannot fit within 40 chars.
Test: Existing tests pass
Bug: 63541502
Change-Id: Ie37e574873d73fc24a3acef5c3c054a561a16f3f
2017-07-26 19:47:44 +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
Doris Ling
c84001528c
Fix gesture preview image visibility not set correctly.
...
- update for the preview image is done only in onStart()/Stop().
Move the handling to onPause()/onResume() instead so that visibility
updates will also be done when switching between pages.
- remove the obsolete GesturePreference class.
Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae
Fix: 63783217
Test: make RunSettingsRoboTests
2017-07-20 20:41:43 +00:00
Julia Reynolds
b49578e485
Merge "Zen priority settings update" into oc-dr1-dev
...
am: 9dec71f7d7
Change-Id: I81e2609637537413bfd36ed9e0658d49d533a9cd
2017-07-20 14:23:51 +00:00
Julia Reynolds
9dec71f7d7
Merge "Zen priority settings update" into oc-dr1-dev
2017-07-20 14:19:33 +00:00
TreeHugger Robot
1dcfbdb0cc
Merge "Delete " / " delimiter in Settings app."
2017-07-19 20:39:05 +00:00
TreeHugger Robot
ba70d1866f
Merge "Settings: Add SMS Mirroring."
2017-07-19 16:52:57 +00:00
Oren Blasberg
d33dcf13ee
Settings: Add SMS Mirroring.
...
Bug: 37546615
Test: Updated Robolectric suite with new unit tests.
Change-Id: I02e1723e1b125b004ff679d6242df14bca4f08ce
2017-07-19 08:07:11 -07:00
Sundeep Ghuman
030b58d917
Delete " / " delimiter in Settings app.
...
Reference delimiter now defined in SettingsLib instead.
Bug: b/62354743
Test: NA - refactor
Change-Id: I021d7cb9b06014b27df0003634ce53ecf1089fa1
2017-07-18 17:13:57 -07:00
Julia Reynolds
78f612b823
Zen priority settings update
...
Reordering & adding summary
Change-Id: Icc3388410bdea9960c1e2c8609b7c3a979dc99d7
Fixes: 63712680
Test: RunSettingsRoboTests
2017-07-18 10:50:14 -04:00
TreeHugger Robot
fe1b8f9017
Merge "update the string for bt disable"
2017-07-17 20:02:45 +00:00