PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,480 Commits 1 Branch 0 Tags
adc7eb052460d5d25a2684d08520019fb99b278f
Commit Graph

127480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
6d50c00a2b Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca am: 40dee4b7a9 am: 9d173f318d am: ede7353183 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578

Change-Id: I2299f38e4342891ab589c4011078719f7d8351df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:40:26 +00:00
Treehugger Robot
d275317781 Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865 am: b6a07fdf0b am: 22b844fb59 am: 0516f5480c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005

Change-Id: I400c3891de86550d36d85011455e3e5a68c07b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:40:17 +00:00
YK Hung
94aafb11c2 Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235 am: aed98fc75e am: fb8d52d1c5 am: 56008450b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004

Change-Id: I04dc90b3f6730c5dd22d74c928df74eaabed37ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:40:08 +00:00
Marcello Galhardo
0fb68e3eeb Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: 751e29cc2c am: e5d991533d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I2eb2e99d8bebe0ce7875bf991410c92d990483d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:39:44 +00:00
Marcello Galhardo
76c05274ee Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: 8f2ebb1510 am: af59a41da5 am: d63e9096e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I31e99bb9e86df2202240e33955e01d5ebd1df497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:38:27 +00:00
Daniel Huang
96e1795351 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: 52567d5ce9 am: 0be8644109 am: 7bd95dd6f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I93813a5828ae13fda9dfa1007c976797b8a0dcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:37:17 +00:00
Daniel Huang
296da292b3 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e am: 67e1c060dc am: 5c131ca160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: Ic6977ce2c1e6d8f449a767da05fbff42c8290af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:36:51 +00:00
Daniel Huang
a7b410e2f8 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: 2c30f604b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I16fe574fca7c12d0e2eab4c07557648571faf6af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:14:21 +00:00
Guangjie (Jerry) Shi
c5464f946d Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: c93df29409 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I9d8c53e90e7c5e0e13ed258f3bcb4f906195781c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:14:08 +00:00
Chaohui Wang
a6821f9917 Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: 2bf036e61c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Id3a6205c1ae0de7fe1f304bc02bea39b10b99816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:13:55 +00:00
Becca Hughes
4c891f0953 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: 6a52165bd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I8d3aa0bf5fb0dcb3f9934870d1c1715a61568e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:13:42 +00:00
Bill Lin
e29138d7ce Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: 9eb1ba4169 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I217c55534d755b1001c666c1690c8eb22c64a47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:13:27 +00:00
Treehugger Robot
570fa06b45 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f am: b73b014d14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: Ie24b4c309f87d0c74edc599bf6295aa152af4c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:04:30 +00:00
Bill Yi
906fb93516 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours am: ac2dc0940e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I071236eb08354e302bafcdc1773dee5338306bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:04:27 +00:00
Marcello Galhardo
6255d37ad9 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: Iab8c01d073f10dbbb55ebead9b8a883f5a93065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:57:21 +00:00
Daniel Huang
615b76a79d Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e am: ad9525bd97 am: 87d9d70efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I2ca92ca73104faf38bc158625c33eda0d41046ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:56:42 +00:00
Guangjie (Jerry) Shi
93f94987f3 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 54a6dd7217 am: 7045faeae1 am: c6c4a3a2da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Ia47e595066e6635034a9a3eca4a524d210a2e021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:56:33 +00:00
Guangjie (Jerry) Shi
f126ef2a8d Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893 am: d8bfff3134 am: 27b27f8143 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Idb3b36d8aafe795ebcdef2b223d079510cec1fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:56:23 +00:00
Chaohui Wang
9fbb200bfe Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: e98635c9fd am: b03ee1ad90 am: e598d5a065 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I40e5760ade3099367cc1941e9e55419a7c318509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:56:12 +00:00
Guangjie (Jerry) Shi
a38a249fda Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893 am: 02f56a627a am: 15eb2fd250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Ie547fcc52b468e91ea35ab2b3596cc561b2f3ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:55:59 +00:00
Chaohui Wang
94197b190a Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: e98635c9fd am: 9ea3fb9e53 am: 16edb9b32e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I0f4b1925dde61e1a547b4c73d6253a0c406fcec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:55:43 +00:00
Chaohui Wang
166368ef2d Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: 8178129fca am: 7b7ff6e1db am: 6a8a4127c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I49fc59707e85a2c271ddd1b0f13e952689741596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:55:33 +00:00
Becca Hughes
c8b77e272f Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885 am: fffa183326 am: 8eee400a71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I0a7939f3feb7c23d2adb7c7628e0edeed2e61ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:55:23 +00:00
Bill Lin
d7c12d5935 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: 55335bc164 am: 9ae72a84e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I398964d12baa8aa7d8ea76fe50325a05e9fc4adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:55:14 +00:00
Becca Hughes
2c0bb567cd Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: 654313a55b am: c20caa3150 am: f23c05db51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I8eef0896266f251003c702c177fb40cf025ae5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:55:04 +00:00
Bill Lin
c70e9ea2c2 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: 496ad744db am: feeaade45d am: d19a1c4a0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I4743c8d7ac4920c17f5489a082028f72827cda88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:54:54 +00:00
Becca Hughes
fd6a0d786b Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885 am: fce08f688d am: af5ce05bf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: If9fc21cb1198a3e0a305df89351d908101452a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:54:43 +00:00
tom hsu
0617631408 [Settings] Avoid NPE if BT device is changed by framework. 
- Do not register only one BT device for primary to avoid primary
   BT devcie change to another.
 - Register and unregister all BT devices

Bug: 280236099
Test: atest passed
Change-Id: I610144c7f8f649e40d99cf1dc7f50d1f3b80f109
 2023-05-11 02:53:19 +08:00
Treehugger Robot
4f174a46a7 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 28f09b6c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I3db3187d7d78f63ad96dd97304fee2c642d07bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:27:49 +00:00
Bill Yi
c9ce34190e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: 7e9b0a8bc7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1b2bed06cade62fdfda045ab735dc39dcfc2aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:27:47 +00:00
Treehugger Robot
75f0a9d40e Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f am: f9d8c74ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: Ibbe94d83ee67d78623ee335bdd5407fbc881372e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:27:42 +00:00
Bill Yi
1475e83aad [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours am: 218406c700 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2d0aa61a75b197376cc22ffeacc017bf30a9e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:27:39 +00:00
Treehugger Robot
c85a655793 Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd am: 0145eec48c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I7d316f8fcdd22a387a8a2ed63ef5a9adbdea95b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:13:43 +00:00
Treehugger Robot
b73b014d14 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I2075b899c586a7b7975b24753a1483a474621dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:12:43 +00:00
Bill Yi
ac2dc0940e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I136d80a61a606d20cb417bbafed6868bc1eb940a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:12:37 +00:00
Treehugger Robot
f9d8c74ccb Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I4a4afe4a04a3d40abde238320315fd304ff34919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:10:06 +00:00
Bill Yi
218406c700 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41d460241b8cf05258d3476effce8daac7bb54e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:10:00 +00:00
Treehugger Robot
e370dbf53d Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: 568034bd25 am: 3bd166535c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I25ca3cfb17fb71264d38e9b84f5499c20d875c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:08:27 +00:00
Treehugger Robot
8e40694817 Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd am: 13e131f352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I49f8377cff2699da3a8bede458ba09e9af29c594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:08:02 +00:00
Becca Hughes
68470a4f27 Warn earlier about 5 provider limit 
Test: ondevice
Bug: 281616441
Change-Id: I4c4d257e1a0a6396b3948a2b50462bbef1987729
 2023-05-10 17:42:21 +00:00
Treehugger Robot
28f09b6c46 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I7fcf17ec832047aa0756583eae1f0a87b491e033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:40:24 +00:00
Bill Yi
7e9b0a8bc7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibebb73e3225272719df3ac79e959f5230aded989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:40:15 +00:00
Treehugger Robot
4fde620b4f Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: If7930aac56969335f549e208c56744aad22488cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:37:36 +00:00
Bill Yi
cd402bd739 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8eb20cddf535b6e0bf431039862ed21e31ac851b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:37:29 +00:00
Treehugger Robot
90d6926883 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: Ibbdacb724f8f9742847524543eea9cacaf61e5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:36:10 +00:00
Bill Yi
3464a64172 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee243cd4b9d5d8930d600886000e584a708b634a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:36:03 +00:00
Treehugger Robot
3bd166535c Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: 568034bd25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: Iad4f1fdcf6766e175da64835e7c703f697e3d9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:30:45 +00:00
Treehugger Robot
0145eec48c Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I1bb59a1afe40cee69dd58c04d2778253f1313b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:30:10 +00:00
Treehugger Robot
b8e02ef73f Merge changes from topic "tc_change_2305100725_22" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-10 17:26:27 +00:00
Treehugger Robot
13e131f352 Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I1eb27aa635111eea5a31db6ac9e59cfc51ce858a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 17:25:58 +00:00