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

103091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lin Yuan
0b1da12dfd Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I8d2dcc7ee29481cb464147cc7db15ad7eef6c965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:51:25 +00:00
Presubmit Automerger Backend
f683dd9f9f [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc990d6c65d4a20d0a1143803233656b3a48b554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:51:24 +00:00
Lin Yuan
6ff218c0d9 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Iffa9b63e7676c4d2539c2cda1beb130b27091b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:41:05 +00:00
Presubmit Automerger Backend
92e30fd1aa [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b3a99a0e8a50c5bb1032c8240bf936281e240ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:41:01 +00:00
Lin Yuan
e8887ee639 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ib1e30972098ad4a5ba86c1c02092a7d0fc57ac00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:34:47 +00:00
Presubmit Automerger Backend
128d5ad006 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fbb2409a9dd9ef9ad9eef90b135d4ac50636c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:34:45 +00:00
Lin Yuan
2074939b44 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9690cf53373f86006294da0356194bd5c60e1893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:28 +00:00
Lin Yuan
1443446609 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id019ffef8867d7d9b42d413ebc1c56a972899ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:27 +00:00
Lin Yuan
246f5e231c Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: Icc131e7dd1fee70832aaf4627f806850963c70c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:20 +00:00
Lin Yuan
cf07afd1a6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5faca0f1d45b2fbc962c507d397a78fb98079f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:01 +00:00
Lin Yuan
db2ea2bcbd [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ec9011a5e3bd003773ccb1faffe324f54630ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:32:58 +00:00
Lin Yuan
0920be7e46 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev 
* changes:
  [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
  RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
 2022-06-02 19:59:35 +00:00
Lin Yuan
5b0617f569 Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev 2022-06-02 19:59:26 +00:00
Lin Yuan
6ffe64a0a9 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev 2022-06-02 19:59:07 +00:00
TreeHugger Robot
fbae601cb2 Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I9e3864b6225526ce72620b5af9e718b2512d0397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 11:34:45 +00:00
TreeHugger Robot
1ef5a1c86a Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: Idd1b1e42bacbb74d950d9aa9a367b0f3a9fe176c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 11:18:16 +00:00
TreeHugger Robot
e6ee0ba1ca Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I38e251a90df0d85b02e4a90e60434374caebb43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 10:56:20 +00:00
TreeHugger Robot
b2a6f3b640 Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: Iea8346aa727c8ca1b9ccf7511e4c360c559c94c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 08:40:00 +00:00
TreeHugger Robot
2e68c87afc Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I8d59841265494fc6b1e1b280c6c275c4103959be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 08:13:52 +00:00
TreeHugger Robot
165c11c0da Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I808a8ab16e700325ec93b028e22a58215fbdbbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:58:27 +00:00
TreeHugger Robot
6fd7cf1993 Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I6c7835e9885cf02ba167a8f4ac1c564bad511e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:34:09 +00:00
TreeHugger Robot
e3bbadb7df Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:15:36 +00:00
TreeHugger Robot
5814c94856 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74bffca5423b7133667656b3b5c51414c4116b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:03 +00:00
Bill Yi
9f3d909380 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36c79903c3627740db02324ee6623160773505c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:01:42 +00:00
TreeHugger Robot
2f184b0ff4 Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev 2022-06-02 06:52:53 +00:00
TreeHugger Robot
2dd22a060a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-02 06:41:58 +00:00
Betty Chang
397b8e1944 [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: Ifa7c9df20a76fe233a4b48f2de06ef6a6774cbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:17:58 +00:00
Betty Chang
d131bdfbec Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2113244

Change-Id: I4d58377302a60869bce6cd4d2a70a6f61d35e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:01:11 +00:00
Betty Chang
e3295efcd0 Merge "[LE Audio] Broadcast Sink UI" 2022-06-02 03:34:59 +00:00
TreeHugger Robot
4a0fa16423 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I087fa5ba6781a56717e49da368393b11b5d9e470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:15:10 +00:00
Bill Yi
63f15c33d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7b942b83171e4032a767c985d1b98ebdc72887f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:14:47 +00:00
TreeHugger Robot
34534c87b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b8c9672581e4ee6fbf0533626d25f702a5c8e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:51:01 +00:00
Bill Yi
95fef514c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a14edab2cb0cc8d0878cc0a0195db8b8ae816c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:50:35 +00:00
TreeHugger Robot
9d995e75a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 23:22:20 +00:00
Bill Yi
8cfc636454 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ac5e91be389bf3a7c8ff54c6f8c8bd924c35fd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:04:01 +00:00
Bill Yi
6620ba750b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30af08bada2f825641e1dc015b753bd242b63315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:40:56 +00:00
TreeHugger Robot
70cdd5c5b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d7afd78b111c3fa396339a430c6e2daf6d40140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:49:12 +00:00
Bill Yi
8a85b26086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ec8e5a382eb8887ee7fedc3acfe14d8e21e6158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:49:05 +00:00
TreeHugger Robot
c705beea0d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-01 19:23:59 +00:00
Joshua Mccloskey
3dd64a3e25 Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: Icd03348aae7c7f2814a4b00244016caaf8f6bbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 18:53:17 +00:00
Joshua Mccloskey
14a5aded8f Merge "Ensure lottie animations are not empty." into tm-dev 2022-06-01 18:02:39 +00:00
Chaohui Wang
c308cad5c4 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I2b28f1f5052b553accc273ac356bd47ea832e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 12:37:45 +00:00
Chaohui Wang
9ada0accef Merge "Clean up DarkUIInfoDialogFragment" into tm-dev 2022-06-01 12:24:24 +00:00
Lin Yuan
a12fff673b RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.

screenshots: http://shortn/_EUOdqrOcnS, http://shortn/_j320QDm1Zo

Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device

Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58)
 2022-06-01 10:53:49 +00:00
Bill Yi
a3d586794b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id5c20332cf35d47975bb187aa64db2045acaebd3
 2022-06-01 03:47:38 -07:00
Bill Yi
3466df0415 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9c0c9eb87ae757d27c2917878e21cb2a7b3bc217
 2022-06-01 03:43:59 -07:00
Presubmit Automerger Backend
b7ebd6e3a3 [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Bug: 228315522
Bug: 228315529
Change-Id: I8a81fa13e357a7c32a1dde49e0e14fab176ad0fb
 2022-06-01 10:37:14 +00:00
Lin Yuan
2598a722ae RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.

screenshots: http://shortn/_EUOdqrOcnS, http://shortn/_j320QDm1Zo

Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device

Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58)
 2022-06-01 10:37:04 +00:00
Bill Yi
7e605531d0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I577bf242a12cc6c991af536908032b74cf248c93
 2022-06-01 00:12:09 -07:00
Bill Yi
4a398405a2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f567279aeb9988c80aa4307da54c62823b2682b
 2022-06-01 00:01:36 -07:00