PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,991 Commits 1 Branch 0 Tags
7a16645c6042dbcb1530683b62875b9e89019628
Commit Graph

129991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
8b1bfeef73 Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: Ibff4ceef103e798e1e27ee413009ccac92a79cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 02:09:50 +00:00
SongFerng Wang
3a07547d81 Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: I919d6d7e09a7cdff2550bd667a1cb5fcb435b610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 02:05:51 +00:00
SongFerngWang
ea85e3b2fa Add the log and moving it into onResume 
Since user can open two settings app(one is via settings app button and other one is via quick settings) and user can switch them to foreground by the recent page. If user can goto the deviceDetails at Settings_A and then changes the config value at settings_B, then the user goes back Settings_A to check the UI. If config is in the init, the UI can't refresh the UI.
Bug: 285086232
Test: build pass.
Change-Id: I2284940eddcd02c543522b60f951c0d8d25775fd
 2023-06-07 01:45:31 +00:00
SongFerng Wang
4929da451c Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev 2023-06-07 01:33:59 +00:00
Treehugger Robot
24e5321dfb Merge "Move DisplayDataSizeTest to AndroidJunitTest" 2023-06-07 01:25:28 +00:00
Chun-Ku Lin
24b045c987 Move DisplayDataSizeTest to AndroidJunitTest 
**Root cause**
- When DisplayDataSizeTest was created, it was ignored already due to
b/214161063. That means the test never passed in the beginning.

- The default display's type in Robolectric is TYPE_UNKNOWN. However, in
the constructor of DisplayDensityUtils, we check all the display that is
not TYPE_INTERNAL can't be a default display. Hence the test failed.

- Even if we shadow the DisplayInfo to have TYPE_INTERNAL for default
  display, the test still failed, because whenever we tried to get the
  default display density we always get 0, and doens't have other diplay
  density values. Hence we can't test increasing the display size in
  Robolectric Test.

Note: the solution here is a workaround for waiting AsyncTask to finish.
If we ever change the implementation in DisplayDensityUtils to not use
AsyncTask, we'll need to update the test.

Bug: 279082331
Test: atest DisplaySizeDataTest --iterations 20

Change-Id: I3ccee5e7ba4d9399a8b715d84a9d53e106f88762
 2023-06-07 00:06:48 +00:00
Wenhui Yang
71b8076566 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 am: e947da08e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I097e0a9e37fb960118efc10724ebe95efdf7caa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:53:16 +00:00
Ale Nijamkin
e898743617 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: ef6f54982a am: 649eecde6a am: 65e9aee62f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I9a71f3daefc59f9876cfaa9d3fb6194ff8f615c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:52:59 +00:00
Ale Nijamkin
2052f6f295 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: 163c01ab4c am: 42521b3663 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I96ecf14b13246642ae01e57b9cd94c69e9a7903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:52:50 +00:00
Ale Nijamkin
b861fce560 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: dc6449157b am: fd48767844 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I4ba35098d32fd2219b06d5d971ee2aae4e2e409e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:52:09 +00:00
Wenhui Yang
e947da08e3 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I1aa4a7a33a14adae4a5fcbe1f443b3af89ed674b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:12:54 +00:00
Ale Nijamkin
65e9aee62f Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: ef6f54982a am: 649eecde6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I5e29fa05f6e2a1097e0880a1549e37cc9559e4f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:12:51 +00:00
Ale Nijamkin
42521b3663 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: 163c01ab4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I7d6c4069a13d77c7acb907137f02142cd87f191a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:12:23 +00:00
Ale Nijamkin
fd48767844 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: dc6449157b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Ifad706722aa509bcad777a6af0fd4749629eb5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:10:27 +00:00
Wenhui Yang
4eceb6c5c5 Merge "Fix face model delete message" into udc-qpr-dev 2023-06-06 21:09:56 +00:00
Ale Nijamkin
649eecde6a Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: ef6f54982a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I80f49b784981e76fb05f122f62c9cb59e387aac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:29:51 +00:00
Ale Nijamkin
163c01ab4c Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:27:23 +00:00
Ale Nijamkin
dc6449157b Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Iac1b92075d8113012e69bdc82462921191690ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:26:05 +00:00
Ale Nijamkin
d31487b529 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 306421f87f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I6ca144e73e9d3e4465dcfd0325b57add2f61f426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:23:19 +00:00
Ale Nijamkin
1e3ecf6352 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:44:29 +00:00
Wenhui Yang
5e71aee4cd Fix face model delete message 
Add new strings for face model deletion when fingerprint unlock is available.

Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
 2023-06-06 19:44:17 +00:00
Ale Nijamkin
306421f87f Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Iedb6d5b7454e973a99d512cda94b0278fa801d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:44:07 +00:00
Ale Nijamkin
ef6f54982a Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I9248f9d94bbd8bbea16c93cd2a1a259fa43fa1d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:41:14 +00:00
Ale Nijamkin
b5dda005fd Merge "Fixes nav stack issue." into udc-dev 2023-06-06 18:48:59 +00:00
Automerger Merge Worker
f89435ef11 Merge changes from topic "am-a85daf5f57ad4c94a8e17cfffed8df36" into udc-qpr-dev-plus-aosp am: 4c43d97d86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559399

Change-Id: Iae79e22e5b55024bbfbc80f0ed876210b77f9b3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:58:19 +00:00
Treehugger Robot
01ccedb97c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours am: 1a02d5733e -s ours am: 3c8b2b65a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I064c6c0af7cf0f0a7ff83aaafce1386ca78083f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:57:46 +00:00
Treehugger Robot
9adfdcd4af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours am: e0a3e3a8f9 -s ours am: a1898a0218 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia20881c6ca26af0be0e16bbaa1c1a4552d43e79f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:49:21 +00:00
Bill Yi
b57dd22f83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours am: a4dd0da90d -s ours am: f0beeb3c1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09e4f84b47e5523db85dfe48c0c7388feb1328b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:49:14 +00:00
Treehugger Robot
7c52e287eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours am: f2d7712bfc -s ours am: 70bb780dce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccc4f5ded71d7b56f124df94b31ccae697ca2307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:49:11 +00:00
Bill Yi
d93ecda33a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours am: f740db022d -s ours am: 656362603c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I588e05963dc4d5d69db170659aedcaf8b084269f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:48:50 +00:00
Treehugger Robot
7baf165caa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2 -s ours am: 4b7663cbf1 -s ours am: ad3219fda4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1fc7de545f46efe7539a837abd3c937a8c73237c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:48:37 +00:00
Bill Yi
327393a7f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2 -s ours am: 59f5c56e84 -s ours am: 7fc8621dcd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I402eefc7211372606bd48a36b3e52c26673a8e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:48:26 +00:00
Treehugger Robot
6ba556a347 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 1dc6b2d265 -s ours am: 28a5ce5fc5 -s ours am: e576574ac9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d9956816933a1e447b358285aa25ff02086ced8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:44:16 +00:00
Bill Yi
b0723e2829 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: c0e9862110 -s ours am: 524d887d72 -s ours am: cabcc64d06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0c3baadd6e9fe6109d68499671308073fd7f254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:44:13 +00:00
Treehugger Robot
b5d303d807 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 1dc6b2d265 -s ours am: 44ccdc1fee -s ours am: 844d8a272e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34d791368f1cd4a594c8d405a3a16e32aafa41fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:43:52 +00:00
Bill Yi
23fec176ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: c0e9862110 -s ours am: e881cb0f82 -s ours am: 572b37da04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d0f6f71c0a4cb4588499228c9f3c8cb84ef339a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:43:48 +00:00
Automerger Merge Worker
61c118be7e Merge changes from topic "am-ee1e11b48ff64035aa2f6bbc85aea648" into udc-qpr-dev-plus-aosp am: 76b9f31667 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401

Change-Id: If2846a2fe8cd3d3dda2d572bc60c46293cdf8d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:42:12 +00:00
Treehugger Robot
cd99a1f467 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 12ec34641e -s ours am: 7e87dbe180 -s ours am: 178a4c1da3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I180bea41d7625d34c95d0015063ee30a5c490e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:41:35 +00:00
Treehugger Robot
a00c5ab975 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 12ec34641e -s ours am: 9c6aa99c82 -s ours am: 213cfbba28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78f5d9314f97da6695721fadfe94ca1ca45250c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:28:32 +00:00
Bill Yi
ecc9d3d1aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours am: fe99021d55 -s ours am: 9180964e49 -s ours am: f3c5b4b5e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide63b7ab66a9b486b293d7ae5d5688d1ef41106b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:28:25 +00:00
Treehugger Robot
96366faa9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours am: 04f844c712 -s ours am: b61f2fca16 -s ours am: fb9d94f892 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46e3ed6c67be3a1a5b78549ded09900308511157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:28:20 +00:00
Bill Yi
d376bcf240 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours am: 5e71a3fdf4 -s ours am: 16cb3a2b76 -s ours am: 33f5a5a0b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida281c81bb402e23b5f4ea596821fb9ae613a109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:28:05 +00:00
Treehugger Robot
abf5d2a3b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours am: f14e96fe88 -s ours am: df93f73e95 -s ours am: 5c864d3727 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ebce773aed296b0d9277813e74b5f3cc80dd85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:27:51 +00:00
Bill Yi
b8b5d2e02a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours am: 4fdf445fc4 -s ours am: 0f8055172f -s ours am: ac729b4c8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d5554556beab1e1ece4b78bb1f24baa98079d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:27:40 +00:00
Treehugger Robot
0fe3ecacab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 76c1870f35 -s ours am: a1f4ce4630 -s ours am: 9fde218320 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I534bdb11527aeb5ba49c8b9a16892f7afa5110cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:21:18 +00:00
Bill Yi
9dd55db791 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: 2ca99ffb12 -s ours am: 4eae0d6d34 -s ours am: 7151600a5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97a1fee29bb9d1990996c5b8a817646c50080386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:21:14 +00:00
Automerger Merge Worker
54e19e68f5 Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into udc-dev-plus-aosp am: ed4143dc5b am: e64b222833 am: 36ba90a1ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401

Change-Id: I969d121577aa10c6d0d4e24f5e836bf3787ba3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:20:22 +00:00
Treehugger Robot
1e94c41743 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 7db508358d -s ours am: 27778df8f6 -s ours am: a93ef6d447 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e134f8eea56632a650cdf94a9efef3fcafc35e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:19:49 +00:00
Treehugger Robot
6abdec5254 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 763b15231f -s ours am: 6cb60f0b37 -s ours am: d34e9c4a90 -s ours am: 93b91cce2f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23b5603965129f42b2219e0f2cdec0b91d58369a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:19:15 +00:00
Bill Yi
b6aac7c05a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 32fce5403f -s ours am: 4efcac35a5 -s ours am: 6e20f60e75 -s ours am: 2bdb446351 -s ours 
am skip reason: subject contains skip directive

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

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