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

104357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tsung-Mao Fang
0eb3011fc2 [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:54:19 +08:00
Tsung-Mao Fang
0e5c208a4f [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:53:18 +08:00
Tsung-Mao Fang
0d8d05a221 [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:29:53 +08:00
Tsung-Mao Fang
90968c8437 [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:20:38 +08:00
Arc Wang
46e00dc6df [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 10:17:47 +08:00
Arc Wang
d94b73b304 [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 09:52:17 +08:00
Arc Wang
973a46134b [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 09:51:42 +08:00
Arc Wang
e3134c4a04 [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 09:51:05 +08:00
Arc Wang
73985c8296 [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 09:49:30 +08:00
Arc Wang
67b9fb57ea [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 09:48:26 +08:00
TreeHugger Robot
73bfce4c4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -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: I6856085af687f344ec39fa21a8719526acdc6ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:24:15 +00:00
Bill Yi
237335386d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -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: I5ed6506676648dba77eeb5b183a5c52f74462198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:23:56 +00:00
TreeHugger Robot
a543e38931 [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: I0b85da8787c176a23783d96ceeeef9c42626f8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:16:33 +00:00