PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,740 Commits 1 Branch 0 Tags
f3b9bf55a9a43163ab660b4fe7bdaea8d36902cc
Commit Graph

104740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lin Yuan
62d47086be [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: Ief7035d92055b44a01b8954153a9939de32d5290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:35:38 +00:00
Lin Yuan
86c609fc27 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: Id0b3a441f5b7cad917f73076a57c15d775496862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:35:01 +00:00
Lin Yuan
9270941726 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -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: Ifd2a8bbd74365df0998917bfa360b3148157dcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:34:55 +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
1e45df2451 Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Iec14adb488a174788965c941d1f688524959b9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:34:00 +00:00
Lin Yuan
36069908ce Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860

Change-Id: I5e3c940b4dda8b6b6802c2c49260bbad1e661372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:50 +00:00
Lin Yuan
4daf65ea3b RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860

Change-Id: I879d097018e3d4f99d9a8e9f788820a0729d8b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:48 +00:00
Bill Yi
73cce5c14c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia49f737cc5715a3d46a483f5c4fd695bc72a50ea
 2022-06-02 13:33:28 -07:00
Lin Yuan
381d6120b7 Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I043e7119d2fe281f085ba99ff12759dc588be57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:16 +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
95d21bc12f Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386

Change-Id: I6fdfb9076352a14d139425965fd091a70b7c4f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:33:00 +00:00
Lin Yuan
d78ed7aa73 RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386

Change-Id: I1d6ccb2b76503875626f5422db30b90442114f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:32:59 +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
Bill Yi
8f7ce798e7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic884cd038873ee7aaa8468e81fb1c07408dcc251
 2022-06-02 13:29:41 -07:00
Lin Yuan
d765af048a Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev 2022-06-02 19:59:49 +00:00
Lin Yuan
3a95e552c6 Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev 2022-06-02 19:59:42 +00:00
Lin Yuan
10b5ab82f5 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod 
* 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
97c15312fa Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev 2022-06-02 19:59:35 +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
Muralidhar Reddy Mule
8d9c7445a8 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: Ie6673d39e96342de744f7ffad2bf3f49b8ff1805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 17:02:19 +00:00
Muralidhar Reddy Mule
77381e7e35 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev 2022-06-02 16:40:16 +00:00
TreeHugger Robot
bddc73bc19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib11f0b22f8f564c8694eb45881c5bcacf6538342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:31:22 +00:00
Bill Yi
d2454198f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81256a9b9656540f41a40b91d4164fd372b8cd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:31:05 +00:00
TreeHugger Robot
37b8f2deeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id37f54470bc3c818ad8df51170b2d58508cc1dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:30:40 +00:00
Bill Yi
048fedac8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc8932330838ad505038f32648734ecb6d865231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:30:15 +00:00
TreeHugger Robot
81d673b4cf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-02 14:04:06 +00:00
TreeHugger Robot
0d203757d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-02 14:04:06 +00:00
TreeHugger Robot
e4a5991f5e 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 am: 3ff3ace823 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I576c7d7e3d4b3c86e9f92838822d5ddda50bacf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 11:59:52 +00:00
TreeHugger Robot
3ff3ace823 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: I6bad482c52f4111d402d052db2261ed895b273b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 11:36:07 +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
295de2209f 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: I53ee69ae4b1564444d04aa8e8be5e1fe8a4d6421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 08:39:01 +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
9d02540241 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: bf8f3193d9 -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: I00f0abb7ca23576dbe4c4e7a0ef2987935cf5688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:37:10 +00:00
Bill Yi
c527092d8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -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: Ia0ea3cc2bcfe6a0ffa5184e5f4c0057b7bc3788d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:36:52 +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
bf8f3193d9 [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: I45c604d81e17f32008d09e8d6268f7ff98c812ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:53 +00:00
Bill Yi
f8a50b4b89 [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: Ie867abf082d0eb78a26650398c2a8ad89ccdb68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:36 +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
TreeHugger Robot
25baef57f3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 05:15:53 +00:00
TreeHugger Robot
4704f5c76f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 05:15:53 +00:00
Tsung-Mao Fang
edf4416177 [DO NOT MERGE] Fix can't change notification sound for work profile. 
Use correct user id context to query the type,
so we won't get empty result unexpectedly.

If we get the null result, then we won't set sound sucessfully.

Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
 2022-06-02 10:57:50 +08:00
Tsung-Mao Fang
32145cc362 [DO NOT MERGE] Fix can't change notification sound for work profile. 
Use correct user id context to query the type,
so we won't get empty result unexpectedly.

If we get the null result, then we won't set sound sucessfully.

Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
 2022-06-02 10:55:47 +08:00