PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,963 Commits 1 Branch 0 Tags
22b1bb81dda97b836b67ed2adf2c06c5d944b16c
Commit Graph

76963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
TreeHugger Robot
97db4cf9c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: b72f1f5475 -s ours am: 88bfc14aba -s ours am: e30b0568ce -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: I1aed56fab4c143e9d8529a1f3cb238fdf3245139
 2020-08-19 16:53:15 +00:00
TreeHugger Robot
dcd910ed06 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-19 16:43:17 +00:00
TreeHugger Robot
85f6aa5330 [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 skip reason: subject contains skip directive

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

Change-Id: Idb5d01a49296bcc51e4440062aceb9acd7e48266
 2020-08-19 16:43:03 +00:00
TreeHugger Robot
e30b0568ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: b72f1f5475 -s ours am: 88bfc14aba -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: Ibf82a407cbd8768794fc432c1963ab0298a98d9a
 2020-08-19 16:42:03 +00:00
TreeHugger Robot
6a87f7c8cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 90509b64fe -s ours am: d9bf35b984 -s ours am: e0d9bcd358 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib472eb05ac2a9a8d1090f0b7253aede5c0a2f3e6
 2020-08-19 16:35:00 +00:00
TreeHugger Robot
81ec600ef0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 670032d648 -s ours am: cb977356ca -s ours am: 7784b6bce2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3af76766adc6bce3daa15436fc9e42c6e7d93c5e
 2020-08-19 16:34:55 +00:00
TreeHugger Robot
64ceb3d8c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: ed312ef4fa -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: Ife48c37c57f413abf5c5a9f2bed0f9359174be7f
 2020-08-19 16:34:40 +00:00
Beth Thibodeau
a9d2421cfd Increase char limit am: 11f8554405 am: 8baf14632c am: 043ec22d6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407749

Change-Id: I7716749e00962f7f48e70df700a7e17e8695fe42
 2020-08-19 16:34:38 +00:00
TreeHugger Robot
88bfc14aba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: b72f1f5475 -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: I07d7f394e089e62f3b78c263a8b5b488d0985c61
 2020-08-19 16:28:55 +00:00
TreeHugger Robot
e0d9bcd358 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 90509b64fe -s ours am: d9bf35b984 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a068f50e0a4365616162989484f0566a4698ca3
 2020-08-19 16:25:20 +00:00