PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,864 Commits 1 Branch 0 Tags
328f4edc3a33a281fdfe32fec05c50a614e2108c
Commit Graph

121864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
2a874ed261 [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours am: 9a40a296cc -s ours 
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: I8ad731bdbbad463e7667e1c79816baa25839fc70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 08:53:00 +00:00
Betty Chang
ee536e004c [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours am: 9a40a296cc -s ours 
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: Ibcec14b1fdaa8f859958a499932ec6dcee4f7ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 08:53:00 +00:00
Betty Chang
9a40a296cc [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours 
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: I0886a26aba0650bc1699878e30ffb17ebbd3a3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 08:13:47 +00:00
Betty Chang
0fd1625895 Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740

Change-Id: I704c81ac2d045142be5c7cc1835efa6d46cd2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 07:35:52 +00:00
Zoey Chen
4a3d0d7f8e Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522

Change-Id: I52941b212917464a6489dcd2bf782bcb0f6e3519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 07:19:45 +00:00
Zoey Chen
eadb730164 Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522

Change-Id: Ic5b81e03b184c7ea94ceae385b4eef175bbdb189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 07:19:24 +00:00
Betty Chang
1de44c2447 Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740

Change-Id: I3747bf58a841c0c0213d6b27525d9aee992f85bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 06:59:18 +00:00
changbetty
7cf90fbe36 [LE Audio] Set activity for result after scanning the QR code 
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
Merged-In: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
 2023-03-20 06:48:36 +00:00
SongFerngWang
c678caba4a Modify the log at AutoSelectPreferenceController 
Bug: 270652395
Test: build pass
Change-Id: I3b9611fd3704d0965ace12f2bb13c28ace60eadf
 2023-03-20 14:48:16 +08:00
Zoey Chen
ce77de4240 Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev 2023-03-20 06:43:23 +00:00
SongFerngWang
88717f2c3f Avoid ANR when UI query network selection state 
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Merged-In: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
Merged-In: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
Change-Id: Ifb548de301021f992ef13c3d299de1642f379fbf
 2023-03-20 14:42:18 +08:00
Betty Chang
18eb985e41 Merge "[LE Audio] To remove the broadcast source item that created by receive state" 2023-03-20 06:33:42 +00:00
changbetty
85dd572f18 [LE Audio] To remove the broadcast source item that created by receive 
state

    - When the user clicks another broadcast source and wants to join,
      we will remove the previous item that created by getAllSource().
      And trigger the search again.

Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
Merged-In: I416f0a39e31276876e63360664555f99dd7297c9
 2023-03-20 05:48:34 +00:00
Bill Yi
6bafbe2c33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3 -s ours am: 239e6fb371 -s ours am: fced4027ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8ff3ce865787d4a55a77ece4ecd5effb09fe516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:08:01 +00:00
Bill Yi
7d57d8a077 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours am: da6f0e89d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic88ddc010bf34395247503c12f5dcd9082b6b15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:07:50 +00:00
Bill Yi
2099dc730e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b -s ours am: fe39800ae9 -s ours am: c0fb545e05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32d8fc81680aec5ef7bc2846ecc3aa88f7b99052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:07:33 +00:00
Bill Yi
9f2fdb71c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours am: d4b4e93227 -s ours am: 28d89441e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e7c11a648bb53a93ae94a8196f9d12b82a4e200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:07:18 +00:00
Bill Yi
2b767e23c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3 -s ours am: 239e6fb371 -s ours am: fced4027ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e0fdab8f1c8592fa5e40f8e16b1f7b725ec481d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:07:06 +00:00
Bill Yi
0a1cecff05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours am: da6f0e89d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibee2b2fb73ee481357b695dff235a7fb03da530e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:07:00 +00:00
Bill Yi
3bd0a334f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b -s ours am: fe39800ae9 -s ours am: c0fb545e05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c3ae7704d9b34f2a88daa233ed101c5246b44df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:06:54 +00:00
Bill Yi
7f7f17724b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours am: d4b4e93227 -s ours am: 28d89441e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9257cbe02c349dbd05d32695f3d74bb72670ee72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:06:15 +00:00
Bill Yi
fced4027ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3 -s ours am: 239e6fb371 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1cf18e2670f32b46345e9a5cd58a341ade785f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 21:27:28 +00:00
Bill Yi
da6f0e89d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82c25832e0bc866dd3358bfdc6b3221715f40a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 21:27:26 +00:00
Bill Yi
c0fb545e05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b -s ours am: fe39800ae9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a286a22928278eb03a1b598b6c5a7124ebad845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 21:27:18 +00:00
Bill Yi
28d89441e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours am: d4b4e93227 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e1f41dc91d7b15c4c9ae7c5f80f8dbef35ad589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 21:26:41 +00:00
Bill Yi
239e6fb371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ca121ca22fea96d7e31a26814f1d37a3718f44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 20:48:46 +00:00
Bill Yi
11970fc875 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If014a60d0905d772a9b86e6ead2abb604c1bb726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 20:48:35 +00:00
Bill Yi
fe39800ae9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3b0bc9aa7a005b7a408628254ab71028bec9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 20:48:22 +00:00
Bill Yi
d4b4e93227 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3937a3f3b9fe3b0f28f18118bf38fec03ed22256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 20:47:59 +00:00
Bill Yi
77b98813c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-19 20:02:05 +00:00
Bill Yi
5f0516e69b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-19 20:02:05 +00:00
Jason Chang
e628c23172 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6 am: a261a9f5f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: Ie49174348d0c9afbf949009c59d26662bf78c881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 15:18:32 +00:00
Jason Chang
fac5d59f1c Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6 am: 9b94df1d40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: Ib0f3de4392a5f7fbf64aa405699358a34b3976dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 15:16:55 +00:00
Jason Chang
a261a9f5f1 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: I08bb7f3662c82e52ed36f73b3cff6288fd093295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 14:45:31 +00:00
Jason Chang
9b94df1d40 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: Ia34c19988e286741df8aee146e15e9df1e2c2ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 14:44:39 +00:00
Jason Chang
9522a44bb6 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev 2023-03-18 14:10:58 +00:00
Grace Cheng
03271a2a00 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b am: ff0fa142f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I1ad407af59b450932aea452513ccd31ad23a2644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 08:39:29 +00:00
Grace Cheng
4132364dfb Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b am: 0adbb4fe60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I0997d4382f2067d0bd2e39e06bce116317db22a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 08:37:56 +00:00
Grace Cheng
0adbb4fe60 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I0dfea68284b0e19aaa8a7c21eb8733bc02251a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 07:59:51 +00:00
Grace Cheng
ff0fa142f4 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: Ifebc427b74a8008320d8691689042e2e7bb31084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 07:59:48 +00:00
Grace Cheng
387c36968b Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I12a196c7c0b630885af8ebb820be6ef45177ef55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 07:22:02 +00:00
Grace Cheng
59992bbbb8 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I67dfb8b2e904668b7236187d727f4eae38720888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 06:43:39 +00:00
Grace Cheng
e9c795c96b Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev 2023-03-18 06:18:32 +00:00
Jason Chang
848973d300 Fix the Fingerprint enrollment page's title text creates a truncate 
problem when it needs three lines on the R4 device

Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.

Bug: 269437675

Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.

2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.

3. Check the UI if it has been fixed.

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.fingerprint.FingerprintEnrollEnrollingTest"

Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
 2023-03-18 03:40:45 +00:00
Bill Yi
edc87d7950 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: cb5f2a5316 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb6bd84fe1245c3310ada6c42a31377ddab67628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 02:01:28 +00:00
Bill Yi
19f97147b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a2956d8f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I738c8187ffa3298186d8182da1abdb8795827fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 02:01:25 +00:00
Bill Yi
9afa1a07a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3bcb58f7cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id732e12247b11b3f7e15bcc0b02a3ec02a24fb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 02:01:22 +00:00
Bill Yi
5e635fcaa8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2dbe4ce5e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f1bfdcc83d489d5e6a7a1700e2cbfa2e1fa8965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 02:01:06 +00:00
Bill Yi
a2197093e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7879f2d529 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7482ee953f37d330ce2a2d6bf24d58ca0bcab0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 02:00:46 +00:00
Bill Yi
ca40598f6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62b0143cf5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4d1c5c60dc0b73e58d243ccc113acb6fd7d1636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 02:00:29 +00:00