PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,729 Commits 1 Branch 0 Tags
fa3de1919bf03451fd1a7809b88eaaaeb451838c
Commit Graph

109729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
fa3de1919b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: fcf0332625 -s ours am: c5c54308a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d9531f68e68a14ff68b344d9696629ac0a0ead0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:14 +00:00
TreeHugger Robot
9add0d2a5d Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: ca0b0e7ca2 am: 6510f92f81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Idb59be3179d3c1b692239e268e8670140c3cf48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:30 +00:00
TreeHugger Robot
23eda46eda Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: 232db4bfb1 am: 673a36aa13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I538e826152d4f55cbdb4f19bb7b4ce4ab3c8a574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:23 +00:00
TreeHugger Robot
8467488451 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 am: a00962e0c7 am: 3ab05042dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Icfe369e57766961ce3e4d1c4734dd25cd07548af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:15 +00:00
SongFerng Wang
5d274e0ad3 [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours am: 81d910a3bd -s ours am: edddac92a4 -s ours am: 0752f380cd -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: Id523d38dbff2acdbd560b9aafa81261a84caa691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:06 +00:00
SongFerngWang
ee00273780 [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours am: 0cdfaf2eed -s ours am: 033d0d96a0 -s ours am: 5e65f07c0e -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

Change-Id: Ie5c3cae2e4d017224fce5f66b74ed522e8e838fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:05 +00:00
SongFerng Wang
b6e8feaa9b Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: b5bc3952c5 am: 628229b3cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I5b4ca9cd06f008d6a02b1557860b71e126a8495d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:56 +00:00
SongFerng Wang
b37793b2fe Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: 31fed0ace4 am: 42af662d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: Ib7a3294e65b510fbd9c7cfe2989f50c7420d5c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:48 +00:00
SongFerng Wang
492075f6f2 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 am: 86fd225f79 am: a575d9bed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I6919b4f8203ea14f9d40387460c52684b694fc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:40 +00:00
Betty Chang
713531c652 [automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours am: 34c513f0d4 -s ours am: d1e2280136 -s ours am: 1fbc7f2e58 -s ours 
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history

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

Change-Id: I900acd90cbba67c635e53cae2e4890192fc73035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 21:28:52 +00:00
Bill Yi
c5c54308a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: fcf0332625 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I3fb0dc099644deff88e0bb8b8268ee3a70af3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:12:15 +00:00
Bill Yi
d9de74c23a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62366470c595bf8351efffa900bae281c69e4d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:55:29 +00:00
TreeHugger Robot
6510f92f81 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: ca0b0e7ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I27b1fef4d8b10e072285bc8cbaacf206b1ab694a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:35:42 +00:00
TreeHugger Robot
673a36aa13 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: 232db4bfb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I7d3c81a870fb8c916f27df5959b9a47cc98397bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:20:21 +00:00
TreeHugger Robot
232db4bfb1 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Id2d8b1c03ee685c0d0bca85ac9a569102d8aa239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:14:27 +00:00
TreeHugger Robot
ca0b0e7ca2 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I9ae683784754566b48e88d302b59f575fedca2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:14:26 +00:00
TreeHugger Robot
1dd874906b Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 84afa101d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I700c596bc9a835eb9531997044651ecacc014895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:13:51 +00:00
TreeHugger Robot
3ab05042dc Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 am: a00962e0c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Ida4ea18bc52ea8823a7e11579cb2b52b071d9eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:13:42 +00:00
SongFerng Wang
0752f380cd [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours am: 81d910a3bd -s ours am: edddac92a4 -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: If089521e9928f529092720ec7aa69e38d7b7a295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:13:17 +00:00
SongFerngWang
5e65f07c0e [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours am: 0cdfaf2eed -s ours am: 033d0d96a0 -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

Change-Id: I19d391367cd0ceff9e55298972412dc058af8ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:13:15 +00:00
TreeHugger Robot
a00962e0c7 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I028d9908e9510f2ae7cbebc36f9f23c0498155cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:56:37 +00:00
SongFerng Wang
edddac92a4 [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours am: 81d910a3bd -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: If7af8332cc0fa264020e72cae7c5a8d415b4f9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:56:21 +00:00
TreeHugger Robot
1340a91c73 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:56:19 +00:00
SongFerngWang
033d0d96a0 [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours am: 0cdfaf2eed -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

Change-Id: I98ee0541846246d87e03eadfd07326d41a61966f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:56:19 +00:00
TreeHugger Robot
84afa101d1 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I61a30ba4b96c8cc05c45dffaecabc51a522f0d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:55:22 +00:00
SongFerng Wang
628229b3cf Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: b5bc3952c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: If0981916b377f4a39d460909a4e011ab81ac77c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:54:54 +00:00
TreeHugger Robot
58cc75e217 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I9da420078509e6aa2a8ec37f1929fcdd5f2b4ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:54:53 +00:00
SongFerng Wang
42af662d0d Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: 31fed0ace4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I24945fd96a6fcc131a6fa2ff7db2be252b058550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:40:58 +00:00
SongFerng Wang
a575d9bed0 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 am: 86fd225f79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I6146640d0aab0a0ff5d77aa7d9da4b6ae920032b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:40:51 +00:00
Betty Chang
1fbc7f2e58 [automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours am: 34c513f0d4 -s ours am: d1e2280136 -s ours 
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history

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

Change-Id: I900395b33cfecebaf05024427101b1a2879183f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:40:23 +00:00
TreeHugger Robot
07db5f4362 Merge "Fix can't change notification sound for work profile." into tm-dev 2022-05-27 15:36:13 +00:00
SongFerng Wang
81d910a3bd [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: I024566b56adef549b2992c235d4b202c00c7743f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:34:04 +00:00
SongFerngWang
0cdfaf2eed [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

Change-Id: I790378343eefb8e03232fe325e34209eb290557c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:34:02 +00:00
SongFerng Wang
b5bc3952c5 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: Ie73fca56e20e0c70230ff6823eba12ff63c208f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:33:56 +00:00
SongFerng Wang
31fed0ace4 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I6d335c12227d1be9bc6d753e940ac1994c050011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:33:56 +00:00
SongFerng Wang
0a6ea7f85f Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: 716c801f6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I0d36259fd473eafe9221a559acc5890121795440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:33:23 +00:00
SongFerng Wang
86fd225f79 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I76b7ecd27dcf6b1e682cc104a389c9653b31320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:26:31 +00:00
Betty Chang
d1e2280136 [automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours am: 34c513f0d4 -s ours 
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history

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

Change-Id: I3b9751da93651df23cbba4319d540943eced5d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:26:12 +00:00
SongFerng Wang
e4d42c1515 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I4c163ea303beefcf265ba6b67585d7559aab9ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:18:44 +00:00
SongFerng Wang
640e337b19 Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797

Change-Id: Idcc44c3a8d41c74cb485c5cba0764989adc17a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:18:30 +00:00
SongFerngWang
5de8fbc299 Changing the condition since the esim may be removable am: 82bf2a66b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795

Change-Id: If58f4e897785dd92ed6de2bd847bb5a7a9728294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:18:28 +00:00
SongFerng Wang
716c801f6f Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I2be2c52335ed248f1c1cbca00cf66bf313de9c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:17:49 +00:00
SongFerng Wang
d879d59a86 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I74352201ea603e7786ca6ee686fc9d6f142e7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:17:25 +00:00
Betty Chang
34c513f0d4 [automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours 
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history

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

Change-Id: I1e1d2af2be4b97cbbeaa579963a7865f1c25ba40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:03:07 +00:00
SongFerng Wang
d3a7c75487 Merge changes Ic2ac6a5c,I47dc068e 
* changes:
  [MEP] The removale slot can read the esim card
  Changing the condition since the esim may be removable
 2022-05-27 14:59:48 +00:00
SongFerng Wang
a67d5e25a3 Merge "[MEP] The removale slot can read the esim card" into tm-dev 2022-05-27 14:58:43 +00:00
Betty Chang
e300781fb8 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794

Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 14:47:51 +00:00
Betty Chang
e5a21d345d Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" 2022-05-27 14:30:02 +00:00
Tsung-Mao Fang
40fbcf333f 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.

Fix: 233580016
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
 2022-05-27 21:13:33 +08:00