Commit Graph

74267 Commits

Author SHA1 Message Date
TreeHugger Robot
e0ca36ee0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: b3cbdbdffc -s ours am: 77cca92a65 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428984

Change-Id: I249378a619d605625bd297d464dafaa8ae98ed10
2020-08-23 03:48:23 +00:00
TreeHugger Robot
d8219ea6ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: a8bd2b7a82 -s ours am: a50b560a44 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428984

Change-Id: Ifd10ecef682c179ccefa643fe4ab3c7031601075
2020-08-23 03:48:00 +00:00
TreeHugger Robot
77cca92a65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: b3cbdbdffc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428984

Change-Id: I30c5a364efcdf4f329e3859456d56cff07129c54
2020-08-23 03:26:24 +00:00
TreeHugger Robot
a50b560a44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: a8bd2b7a82 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428984

Change-Id: I9cca8660402368915a6e92f547a549291b85b269
2020-08-23 03:26:10 +00:00
TreeHugger Robot
b3cbdbdffc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428984

Change-Id: I588be9bdc7fc5a367d0de98dd17dfac9c01c3a3a
2020-08-23 03:10:45 +00:00
TreeHugger Robot
db3abcfc6d Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-23 03:00:01 +00:00
TreeHugger Robot
a8bd2b7a82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428984

Change-Id: I7505c1bd6a8af76501f6c89738d02973d2a9f13e
2020-08-23 02:58:59 +00:00
TreeHugger Robot
66239bfaa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-23 02:35:15 +00:00
Bill Yi
8047bb2677 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours am: 7f0716a65e -s ours am: ad6b207d87 -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: I8fa24d61ab58f97831491972f13233325957ccc2
2020-08-22 16:15:09 +00:00
Bill Yi
ce12ac5760 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours am: 4cd2078e50 -s ours am: 8b9b113e75 -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: I4f784246d659043ce4b92a82001dee59d33897c8
2020-08-22 16:14:53 +00:00
Bill Yi
ad6b207d87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours am: 7f0716a65e -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: Idec8ca804446bb6ecc5884d37e6221d0264a25ca
2020-08-22 15:47:24 +00:00
Bill Yi
8b9b113e75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours am: 4cd2078e50 -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: I939ae8ad54bbf7aef5a838bbfbdb5e5da72b6a8d
2020-08-22 15:47:12 +00:00
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
4acf477987 Merge "Add null check" 2020-08-21 05:22:17 +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
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
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
dad3470cad Give a long string some extra space
Test: manual
Bug: 159164084
Change-Id: Ie6a61017a37d01e502e2446ac4cd6a22a4628d84
2020-08-20 16:01:09 +00:00
Mill Chen
db534d9c4e Update battery saver preference key
The updated preference key made slice auto conversion mechanism fail,
so when this slice is requested by external apps, the UI won't be shown
properly. So we need to revert the key to the original one.

Bug: 131897855
Test: manual test
1. Open Settings app -> Settings search -> search battery saver
2. Observe battery saver result item has a toggle

Change-Id: Ifb5b0a6786d60d1e67567272610cc3cb078f11a4
2020-08-20 15:42:13 +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
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
0ab88f263d Merge "[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest" 2020-08-20 04:15:36 +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
54a5f51dba Merge "Update settings together with frameworks/base" 2020-08-19 22:33:04 +00:00