PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,150 Commits 1 Branch 0 Tags
2e4141e4ab6094c22a31bf8fedaef4cb4a5a690c
Commit Graph

131150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a1fd330fb5 Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev 2023-06-15 09:42:19 +00:00
Chaohui Wang
ed6d6c9e0f Migrate PlatformCompat App List to SPA 
So hidden modules are not shown in the list.

This will also improve the developer experience.

Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
 2023-06-15 09:37:11 +00:00
Chaohui Wang
9aa7466cf2 Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev 2023-06-15 09:29:39 +00:00
Treehugger Robot
a3f9f42b71 Merge "'Mobile plan' is searchable even if it is unavailable" 2023-06-15 08:57:32 +00:00
Chaohui Wang
bb47f32011 Fix bluetooth settings pairing page stuck 
There is heavy work to do when add device to list in the
DeviceListPreferenceFragment, off load these work from main thread
to solve the issue.

Make devicePreferenceMap a ConcurrentHashMap to avoid potential race
condition.

Also no longer use getCachedPreference(key) since we not put anything
into the cache, the fallback flow is always used.

Also in BluetoothDevicePreference.onPreferenceAttributesChanged(), move
more heavy work to background thread.

Using System.currentTimeMillis() to sort devices could cause flaky
because System.currentTimeMillis() could be same for different device,
use AtomicInteger instead.

Fix: 286628533
Test: Following the step in bug
Change-Id: Ia9750adb6b4c1424d084381e9d7c2ca8e7912391
 2023-06-15 08:43:17 +00:00
Chaohui Wang
36dfb5ac0b Fix SettingsRoboTests 
Mock the getViewLifecycleOwner in test to fix.

Fix: 287387514
Test: m RunSettingsRoboTests
Change-Id: I346930e9655e4f78227276aee4c2a4e5ae6962e0
 2023-06-15 16:33:05 +08:00
Rhed Jao
07f9d1ccbe Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: If01a1c5c13433e85f9b91790375dc2f297777dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 07:19:57 +00:00
TreeHugger Robot
784119340b Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: ee77d651fa am: f5acc230b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: Ibfbd74b4c9f2298fe210b22dccf36acb71f3c99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 07:17:44 +00:00
Wesley Wang
ddbb5bcd5c Update tablet help article link (1/2) 
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
 2023-06-15 14:38:59 +08:00
Rhed Jao
721a7bacaa Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 06:34:53 +00:00
TreeHugger Robot
f5acc230b3 Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: ee77d651fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: I70bef64fcefc75fc3d3496c76d4af9c85efdd9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 06:31:38 +00:00
Mill Chen
d4eecf6132 Guard slices from being requested by guest user 
According to patch of A-231987122, AOSP restricts app to modify relevant
mobile settings when user is a guest. This change intends to prevent the
slices related to mobile settings from being requested by guest user.

Bug: 278616139
Bug: 277333776
Bug: 262244832
Bug: 278616520
Bug: 278615120
Test: robotests
Change-Id: I4dc4bbfdb5cf76e188e6f62ebfd74ef6fa2fe33b
 2023-06-15 14:29:01 +08:00
TreeHugger Robot
ee77d651fa Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: I8bbc5d48e272ab0a5b7880f1ee3b99043df64665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 05:00:40 +00:00
Rhed Jao
e1c9d65cda Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev 2023-06-15 04:55:45 +00:00
Treehugger Robot
0f2e581635 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c am: d4aa1b65a5 am: 0b25525328 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I78f6be87145c2320113e6d10733d96a14dec59f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 04:47:52 +00:00
Chaohui Wang
6754587edd Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev am: 8617f63823 am: 5d847e0207 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659924

Change-Id: I7ae7f969a3d69849c59fdc6e7a7f44f0c8458f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 04:42:34 +00:00
Treehugger Robot
0b25525328 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c am: d4aa1b65a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I403765aae030e5b1aea4482fc161a43932148b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 04:38:06 +00:00
TreeHugger Robot
1765c1dc6e Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev 2023-06-15 04:07:32 +00:00
Chaohui Wang
5d847e0207 Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev am: 8617f63823 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659924

Change-Id: I71e428a2a332e4ed6f3d4719c28cb5408aeaeb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 03:59:56 +00:00
Treehugger Robot
d4aa1b65a5 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I159952074306255db4397de180ee4b49eb78613b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 03:53:50 +00:00
Treehugger Robot
8182348d5c Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev 2023-06-15 03:02:41 +00:00
Chaohui Wang
8617f63823 Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev 2023-06-15 03:00:52 +00:00
tom hsu
8bb09238bb [Settings] Avoid NPE when user enter WifiCallingSettings back and forth 
Bug: 277833102
Test: Manual test
Change-Id: Ifd3272ddf8b8a27fc7772d860653df2c33a3df7b
 2023-06-15 02:58:42 +00:00
Rhed Jao
b7a4a7daa4 [Settings] Add a verification flow for exiting repair mode 
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.

Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
      settings put global repair_mode_active 1
      am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
      The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
 2023-06-15 02:14:41 +00:00
Hao Dong
9e1435a0dc Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de am: a9f1ed3501 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: I88d843e5c1164e054d4cb48e3f953618e63e2e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 01:46:36 +00:00
Hao Dong
a9f1ed3501 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 01:45:55 +00:00
Hao Dong
61659799de Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev 2023-06-15 01:22:22 +00:00
Matías Hernández
14afe69198 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 16e1ba6886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3d2b991aff7afe619ab30c0afa422600a1aaa7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:55:41 +00:00
Matías Hernández
8ff4d59356 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: bcc13328b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7da4ae60188a56ba41c4e4f0bdd331cdd769598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:54:52 +00:00
Matías Hernández
44522c6220 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce am: 1dbf6ad870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I1d41ada3f9a242a46e0ac3281360ba8a57aadddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:53:56 +00:00
Matías Hernández
4d4e6d4ce4 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: f53692de67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I92760b4c976bf42a5028aef2d190d771a967fbdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:52:41 +00:00
Treehugger Robot
7c0da221b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 982a120a49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e282ec406a306911f2f1714f2bebfee3405c344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:51:11 +00:00
Bill Yi
f0a2d0f228 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: cdb730cdfa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If748d8c87bfb88a9444485ed30180ca909b2e490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:51:02 +00:00
Matías Hernández
25cd1d2e86 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 2f1883c397 -s ours am: dfef40cb74 -s ours am: becca315c3 -s ours am: 92fa0bcfd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d41f49b8fdc9073708620c84ce1366a33ef2f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:13:44 +00:00
Matías Hernández
154147d312 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 5a51d41a4c -s ours am: d2d1643c2f -s ours am: b3654eefc9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd4ee30503e23cb65c9686b65517bf4831945f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:13:35 +00:00
Matías Hernández
cc351ff770 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 5a43ab914c -s ours am: c2d5f12351 -s ours am: 26d18d8182 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia982ff51ed9ba8bfb82d85e058ec8deb604cc014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:13:26 +00:00
Matías Hernández
8d778cc6e6 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 95a2f32e7d -s ours am: 6c6184ef61 -s ours am: b6140d21f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20f9b336cea23288eb90513a6eaf2c89b9d8cce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:13:15 +00:00
Matías Hernández
555e41fbf2 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 4226b5bb24 -s ours am: cdca315c80 -s ours am: f87c8ea544 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51e1af1bc4158a5a1c59cc97263ce3cfceec3558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:12:48 +00:00
Matías Hernández
88e808104b Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: bbfe425326 am: ed1b91ffdc am: c39ab727ab am: 2c36be4494 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: Idd0f5355efdd414204e86eee773604cf890aff4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:12:25 +00:00
Matías Hernández
09eca5f43e Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce am: 68a0fc9469 am: 209fe19e63 am: 7df9182d8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: Iba314319ff1bba50a845f9c0b371e0ddf309db67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:12:03 +00:00
Matías Hernández
b99732664e Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: 33e5518af1 am: 1be0ca9c45 am: 89c5d6f524 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I6ae945e591b9d8d9d9c5429d69dcdd646a5c6072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:11:41 +00:00
Matías Hernández
4120b65c96 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce am: 0bdda899d3 am: 7a97196347 am: 150dc64053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I822656f77cc42a9a2cb0667971172f65c2cb8b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:11:30 +00:00
Matías Hernández
64191767fe Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: e8cfc9cb3d am: 4c941d3a97 am: 88bfc017fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I1eb09214952c1c1583f957fe9d0f880b542977ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:10:49 +00:00
Treehugger Robot
e133e733ae Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 am: 03b39bc5d3 am: 1772660414 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725

Change-Id: I67c72c08388c71765320f3d2b2e87369bdc275f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:09:47 +00:00
SongFerng Wang
059a9fa42f Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 am: 7f29649aa9 am: 2a6553b122 am: 143d1f50ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23688861

Change-Id: I7b01d3754f471f4584bc805fc9914dffac4eed09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:07:11 +00:00
TreeHugger Robot
1561056726 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours am: c358727f7e -s ours am: f1ead71b4f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc406255748ec5557db73a2ba22ce8347474c3d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 19:34:17 +00:00
Bill Yi
62dac6c423 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours am: 7b59426838 -s ours am: 4c42839007 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I644678933a79f4069bdafcc1f8bdf3a625dfdc6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 19:34:08 +00:00
TreeHugger Robot
bcd0ca0252 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours am: 2d110c54dd -s ours am: 8a6ab3ca57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia97e87b48d072bd65221175ac4725da9536d14fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 19:34:01 +00:00
Bill Yi
e09e67ac38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd -s ours am: 03aece6855 -s ours am: 98d73f6e56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba305d77c7d862f53f0d64cbed43d1d9bbd11ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 19:33:48 +00:00
TreeHugger Robot
39ff70392c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22 -s ours am: 49a26f49c7 -s ours am: c97ef4db81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f89a8c7c53e3b37caa121359beabf1e687ef512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 19:33:19 +00:00