Bill Yi
7f0716a65e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428603
Change-Id: I52f65ae9ceb348cb155740f03575c83964cd8a11
2020-08-22 15:33:42 +00:00
Bill Yi
4cd2078e50
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428603
Change-Id: Ie984a3ec13fe9bf2b0db635fc95c4688992189f6
2020-08-22 15:33:31 +00:00
Bill Yi
6923a98c64
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I62e56f374302ccd788ccef846a68fe136959bfb7
2020-08-22 08:26:30 -07:00
Bill Yi
f3dc4cb0b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfbfa807
-s ours am: fa9f63d87c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428722
Change-Id: Ib53c511e42cff0a20cbdcb4a8485368481f9836f
2020-08-22 15:25:51 +00:00
Bill Yi
fa9f63d87c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfbfa807
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428722
Change-Id: I04b9672d3b6a7f208ceee93083b63d3a7151e36c
2020-08-22 14:56:43 +00:00
Bill Yi
9596e60b37
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If87bd78891c259552abf303403202bf949b4fea4
2020-08-22 14:49:16 +00:00
Bill Yi
f5cfbfa807
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2ae32e1fd822610d63b904c1ce8f5acba3cb7db4
2020-08-22 13:33:28 +00:00
Bill Yi
493440b39d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a784d62bc3bd3e542e61adb4d7871ee7da49bd4
2020-08-22 12:52:45 +00:00
Arc Wang
71a25ea64f
Add 'Adaptive connectivity' UI
...
'Adaptive connectivity' toggle button controls whether
network connection is automatically managed.
Bug: 162871294
Test: make RunSettingsRoboTests
manual
Switch the toggle button and reboot device, observe
if the state is retained.
Change-Id: I4499a3639abab356e8faa6316bfa45541efd63ac
2020-08-21 17:17:02 +08:00
Arc Wang
e4ba98cebe
Add 'Adaptive connectivity' UI
...
'Adaptive connectivity' toggle button controls whether
network connection is automatically managed.
Bug: 162871294
Test: make RunSettingsRoboTests
manual
Switch the toggle button and reboot device, observe
if the state is retained.
Change-Id: I4499a3639abab356e8faa6316bfa45541efd63ac
Merged-In: I4499a3639abab356e8faa6316bfa45541efd63ac
2020-08-21 16:44:06 +08:00
TreeHugger Robot
7e98d1a8c6
Merge "Add null check" am: 4acf477987
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407746
Change-Id: I728dc9b23fcb76ea6b0ec547cca13e21f9765194
2020-08-21 05:33:38 +00:00
TreeHugger Robot
4acf477987
Merge "Add null check"
2020-08-21 05:22:17 +00:00
TreeHugger Robot
037161e084
Merge "[Panic gesture settings] Add deep link to emergency contact" am: 6d588a5843
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12417765
Change-Id: I06adc5acad692fce1c23341d319a9b728365dd67
2020-08-21 05:14:42 +00:00
TreeHugger Robot
6d588a5843
Merge "[Panic gesture settings] Add deep link to emergency contact"
2020-08-21 04:57:20 +00:00
Jerry Chang
41815b3961
Update the description of swipe bottom to notificaton gesture
...
Update the description of Settings > System > Gestures > Swipe for
notifications.
Bug: 163387757
Fix: 163387928
Test: manual check the description
Change-Id: I5dc6c460512280fe3163d3c5d1dd8745fea637ee
2020-08-21 11:33:09 +08:00
Fan Zhang
9e9dcd2086
[Panic gesture settings] Add deep link to emergency contact
...
And update icons for all setting items in this page.
Bug: 161394591
Test: manual
Change-Id: I5126e04e3dc06223c9e733be6f953e1f6dc8d495
2020-08-20 12:41:08 -07:00
jasonwshsu
6927f5cb75
Fix 'Settings' entry is disappear from 'Magnification' am: 7b11b33518
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12401654
Change-Id: I26f4b7bb98d2a392a48cc364b2efbdf57e3d70bf
2020-08-20 17:57:08 +00:00
jasonwshsu
7b11b33518
Fix 'Settings' entry is disappear from 'Magnification'
...
Bug: 165787919
Test: manual
Change-Id: I11a0c2ad7898d40caa5ad76a43f430ead82c3b80
2020-08-20 17:43:36 +00:00
Bill Yi
8855449867
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours am: 24a85bad6d
-s ours am: 7504a741b7
-s ours am: 543247f2a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: I1924c227415c3f42c9886097b883c6440473bd18
2020-08-20 17:23:46 +00:00
Bill Yi
7b52801639
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours am: 42d1d98806
-s ours am: f37f5ff375
-s ours am: f3c2dadd14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: Ibcb7adef6f19a87823cff7803278e75100184862
2020-08-20 17:23:39 +00:00
Bill Yi
543247f2a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours am: 24a85bad6d
-s ours am: 7504a741b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: I054b36da304fa698f6bb2d0a9dde2de3b09219fb
2020-08-20 17:12:55 +00:00
Bill Yi
f3c2dadd14
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours am: 42d1d98806
-s ours am: f37f5ff375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: Ibb73459e6cb2021a1dbe6ec60854bc2024398eaf
2020-08-20 17:12:48 +00:00
Bill Yi
7504a741b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours am: 24a85bad6d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: I502b167142709029b3f055ac290b026a543132e4
2020-08-20 17:03:43 +00:00
Bill Yi
f37f5ff375
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours am: 42d1d98806
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: I74da61f4e782312a8dbb2adadd55f067d8d1a2f1
2020-08-20 17:03:31 +00:00
Lyn Han
aea66dcc96
Hide conversation bubble switch if app bubbles are off
...
Fixes: 159340745
Test: BubblePreferenceControllerTest
Test: priority conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle checked
=> app bubbles ON => toggle checked
Test: default/silent conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle NOT checked
=> app bubbles ON => toggle NOT checked
Change-Id: Ia5759c2a06c1da4d84b3dafed95e52c3aa30ad56
(cherry picked from commit 9af95dae7d
)
2020-08-20 16:59:33 +00:00
Bill Yi
42d1d98806
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: I1c82e4f6596bdfee0c15672ac72de469b43faab0
2020-08-20 16:32:49 +00:00
Bill Yi
24a85bad6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722
Change-Id: Ie59b03c55a034cd781711e87a7898644c39fe271
2020-08-20 16:32:38 +00:00
Julia Reynolds
0985eccea4
Give a long string some extra space am: dad3470cad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12402180
Change-Id: I7c737fb16db76aec9a197db105d4a32a43f23982
2020-08-20 16:23:09 +00:00
Julia Reynolds
dad3470cad
Give a long string some extra space
...
Test: manual
Bug: 159164084
Change-Id: Ie6a61017a37d01e502e2446ac4cd6a22a4628d84
2020-08-20 16:01:09 +00:00
Bill Yi
5739e1f877
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1c8c87022237f2cc8b4b5a4623756ddf2f2a3764
2020-08-20 07:46:11 -07:00
Julia Reynolds
4cf561d2c3
Fix pending intent links
...
Test: manual
Fixes: 154795795
Change-Id: Ia870bd0bfd90be852121b542100806cac5bac881
(cherry picked from commit 97894bcfb7
)
2020-08-20 12:38:37 +00:00
Betty Chang
eddd882ec2
Merge "[Testing] Use AndroidJUnit4 instead in ApnPreferenceControllerTest" am: dd6f6fdb64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12399864
Change-Id: I07ed61ce593ac9ab8b3041e50784b8b61632a649
2020-08-20 08:52:20 +00:00
Betty Chang
dd6f6fdb64
Merge "[Testing] Use AndroidJUnit4 instead in ApnPreferenceControllerTest"
2020-08-20 08:28:15 +00:00
changbetty
6f53c94b9a
[Testing] Use AndroidJUnit4 instead in ApnPreferenceControllerTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right
Bug: 165232573
Test: atest -c ApnPreferenceControllerTest
Change-Id: Iab7f648061bab9ea33f6a15231be2344be6b3499
2020-08-20 14:13:46 +08:00
Betty Chang
67490b5cd5
Merge "[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest" am: 0ab88f263d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12399862
Change-Id: I57fa1e56a2000b7e12a9ce7ebf58171d8dcf781b
2020-08-20 04:49:40 +00:00
Betty Chang
0ab88f263d
Merge "[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest"
2020-08-20 04:15:36 +00:00
TreeHugger Robot
482a709067
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours am: c6020bf4dc
-s ours am: f0e3970e0b
-s ours am: 9e7961a12a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: I64ff92b1bafea2331a8c1da3c019cfd34cace0b1
2020-08-20 01:01:54 +00:00
TreeHugger Robot
b4dd9464af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours am: 74da04187c
-s ours am: c1ea758688
-s ours am: 78c06fd399
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: I6b4882f1c904683e1594211a9a8d7c2b4255c6d9
2020-08-20 01:01:13 +00:00
TreeHugger Robot
9e7961a12a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours am: c6020bf4dc
-s ours am: f0e3970e0b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: I4e3393d4e3fe24165088510a05b8b233cd10bebd
2020-08-20 00:54:48 +00:00
TreeHugger Robot
78c06fd399
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours am: 74da04187c
-s ours am: c1ea758688
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: I91c3bd811d0bb8e623ed7fa776c54e4097da0579
2020-08-20 00:54:18 +00:00
TreeHugger Robot
f0e3970e0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours am: c6020bf4dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: I0d67aa96be4214c96c075781a91c7ec8beec7304
2020-08-20 00:44:38 +00:00
TreeHugger Robot
c1ea758688
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours am: 74da04187c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: I3a16d82c86f5f17573b88a1d92799c9c62eede0a
2020-08-20 00:44:13 +00:00
TreeHugger Robot
c6020bf4dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: Id81057446689d4c1874d17f582f7738aaa62b180
2020-08-20 00:33:05 +00:00
TreeHugger Robot
74da04187c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666
Change-Id: Ia0536955a70b5e28da3c36b8e268bb65c746e5d1
2020-08-20 00:33:00 +00:00
TreeHugger Robot
4b4b2b29fa
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-20 00:15:12 +00:00
Bill Yi
5f549433a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe77ec8b7ad9f52fe7b5fc7514fe7eab0bf02f6a
2020-08-19 23:23:41 +00:00
Kevin Chyn
8160083447
Merge "Update settings together with frameworks/base" am: 54a5f51dba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12330782
Change-Id: I0cd02faaecd1b79f5e381a9e362bbc673ca78dae
2020-08-19 22:47:22 +00:00
Kevin Chyn
54a5f51dba
Merge "Update settings together with frameworks/base"
2020-08-19 22:33:04 +00:00
TreeHugger Robot
6ea42ffd33
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dcd910ed06
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406144
Change-Id: Iedab78ba68a5eb7bfd4975bb1dc047737f21c98d
2020-08-19 16:54:10 +00:00
TreeHugger Robot
e17eced281
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf
-s ours am: ed312ef4fa
-s ours am: 64ceb3d8c8
-s ours am: 85f6aa5330
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407164
Change-Id: I1bd638996929b30ef18f78e7b03352ca5de3b039
2020-08-19 16:53:40 +00:00