PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,248 Commits 1 Branch 0 Tags
8f32fa54f7f6767c07fb0d2d95ccb55506d3463c
Commit Graph

103248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
2a6d8885bc [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1328a5b1eec08a2d30940f610911af8978153c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:57:11 +00:00
Xin Li
90645fb925 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib4481f34e89f88b1a74baebdc5499460fe10b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:56:53 +00:00
Xin Li
8adb561455 Merge "Merge SP2A.220505.002" 2022-05-04 20:30:21 +00:00
Julia Reynolds
4138b6f68a Remove notification permission feature flag 
Tes: Settings notification robotests
Bug: 231344755
Change-Id: I3e35eede94ea88bee4c2e7fc03ce998ed68b4f81
 2022-05-04 16:24:23 -04:00
Raphael Kim
ff34195604 Extract app label from component name in notification access confirmation UI 
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
 2022-05-04 19:41:13 +00:00
Bill Yi
4d6d37508c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 5a078b4970 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc4eea9c6cd7482159d32fe35a6502a52199df98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:13:33 +00:00
Bill Yi
f8855596aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 8b81a28364 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44ae32c94533d3e215397ffcb66fdbc155505f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:12:58 +00:00
Automerger Merge Worker
9414c443d5 Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 799c8e2d7e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 7463359b05 -s ours
 2022-05-04 18:01:06 +00:00
Bill Yi
aa298f73f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 799c8e2d7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I542bc948ec4da5ce8d7bc491b72b4f931f7afb57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:17 +00:00
Bill Yi
5c00707228 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 7463359b05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b1513a861a8413f7a65f852fa7a784795fa3c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:01 +00:00
Bill Yi
5970cabb76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 467d913a6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad70f6ca2f6d70770174b33a9e36ceb33f1d0586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:28 +00:00
Bill Yi
670172f665 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 71fc7ec758 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3337a972e148987070b04f0ccdc4908c56772d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:13 +00:00
Automerger Merge Worker
4491a88ed8 Merge changes from topic "am-9fa7d80b21934066ba9777d72c99d3a2" into tm-d1-dev-plus-aosp 
* changes:
  Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours
 2022-05-04 17:58:28 +00:00
Bill Yi
5dcf0e73a7 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I1db50089f8beec126b483e113d39022a0e0813e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:57:50 +00:00
Bill Yi
a2943f2e3a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I566cb689216dc303e5aa6e861938745d52113337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:57:42 +00:00
Bill Yi
b76604c461 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: b8f6039a2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I02ffbbea7abcf4c87a61cc62d2e9f33eefa964ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:57:04 +00:00
Bill Yi
ae99e62db9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: d7503db15f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib402de15b16ea2a2413939f48b61f96427e85119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:57:00 +00:00
Bill Yi
8b81a28364 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic830e17841ab22cc7fa0e049c7eb84d5cf2a4b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:55:10 +00:00
Bill Yi
467d913a6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2565abcebc483a44237c833f9a36be3d3005b4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:53:48 +00:00
Bill Yi
71fc7ec758 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I902543a8555957418b8fd227d1f95693c0fc643a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:53:33 +00:00
Bill Yi
5a078b4970 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I887b8dd450faf42fbf9d8886bfa7108572921d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:47:53 +00:00
Bill Yi
799c8e2d7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I535e68e76c490fc74e867219171cc676f8573e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:46:51 +00:00
Bill Yi
7463359b05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e280a5b5b24cee615f9997de42e829c63edd7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:46:35 +00:00
Bill Yi
7034e737b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad59e7632d6735b20e2400ae8fc33aee9dff6fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:43:53 +00:00
Bill Yi
a467f9dcba Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I3e0f7907f7836ab2edb63dba3d4deeb431913b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:41:07 +00:00
Bill Yi
58da6d7afd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib180e8d399762411648d527ba4075f8b152f18da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:41:00 +00:00
Bill Yi
6b59002229 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e1f7b6a32e9e4261c6c512caa74d7a4f3aa69f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:48 +00:00
Bill Yi
b8f6039a2a Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I01f7dce50e08466c636f0589250cedc812be15d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:29 +00:00
Bill Yi
d7503db15f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6b8bf897e3f5ad1371ce8fd0881adb6fc193276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:22 +00:00
Bill Yi
da1aaa3069 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic359719019638ea11ed7571906b3e04af3f5890f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:21 +00:00
Bill Yi
261936eccf Merge changes from topic "tc_change_21" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-04 17:07:37 +00:00
Bill Yi
8c0d18ada4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:07:37 +00:00
Bill Yi
9349330a1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:04:03 +00:00
TreeHugger Robot
38468ab17a Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ife8cf047608c12e7d89b101f7eadd80b99cc10dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:54:28 +00:00
Automerger Merge Worker
0a6ed415d0 Merge "Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2" into tm-d1-dev-plus-aosp 2022-05-04 16:53:54 +00:00
TreeHugger Robot
093f22058c Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I548ff88e2c15005b9be8ef1cfe60400c53ec39fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:52 +00:00
TreeHugger Robot
9f25dfbe24 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 4a79ecce7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I394ab524cd11acf93961e557ea94ea83599b1eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:50 +00:00
TreeHugger Robot
aa2edb9be4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d61d5316a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: If1618fdc467bde0a76db51f7456af999acbdd476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:34 +00:00
TreeHugger Robot
5a138163b4 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I21294fc5b06c6eaaf512cdb84d5c83f318baa140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:32:18 +00:00
TreeHugger Robot
d5f1760bc2 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I2b49fcfb402b1269c38c35f840d8d09e53dacb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:30:58 +00:00
TreeHugger Robot
4a79ecce7f Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ic6dcbe5d513d4fa3a9ca3fb7e03add4eb978d145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:29:50 +00:00
TreeHugger Robot
d61d5316a3 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I39353aff59e39b3fc6219f52a836e03920cb99cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:28:55 +00:00
TreeHugger Robot
3fb9c1a24b Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev 2022-05-04 16:01:35 +00:00
TreeHugger Robot
2e6d03d0f4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev 2022-05-04 15:51:34 +00:00
Ayush Sharma
322d401aa8 Move set work lock message from header to footer 
Also update the string.

Bug: 206083998
Bug: 230625178
Test: NA
Change-Id: I3e442f6a43e01f3633255551aa42902bf24e4aa8
 2022-05-04 14:29:43 +00:00
Yi-Ling Chuang
d9453bf8c6 Show previous query upon configuration change 
Save the query string before configuration changed and set the previous
query string upon the re-create.

Fixes: 204158119
Test: robotest
Change-Id: I48b2a4b272873665a653d2ebc4c02bb99d4b0d0d
 2022-05-04 22:22:26 +08:00
Automerger Merge Worker
2d38a00204 Merge "Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: c2ff0c7b74" into tm-d1-dev-plus-aosp 2022-05-04 10:00:11 +00:00
Chaohui Wang
2a50339348 Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: c2ff0c7b74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I2fa3e4e6bebf2854b3ea0d2949d3f27ba5c45325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 10:00:08 +00:00
Chaohui Wang
58b70b17f7 Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: 5f99fad806 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I9a7101fdd4ce16c34d2ad04e36c0272f72c509a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 10:00:07 +00:00
Jason Hsu
7f93722a80 Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f am: f754ec4926 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

Change-Id: I8967abb73d40d7a374a01c0f46a16f54618644a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 09:59:28 +00:00