PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,198 Commits 1 Branch 0 Tags
d9bffbf71a5681c1fb996a1e541bae19c9df9c3c
Commit Graph

112198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
56094f5a5e [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8c4b1bff4f405371c46810afac011d2655d92a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:06:21 +00:00
Arc Wang
f6d30578b6 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history

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

Change-Id: Id338f4ffe6d94f2552281c47c5589739604c5fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:06:14 +00:00
TreeHugger Robot
7828afe859 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29c94990fd4fd817084566ded10bb1bc851ebcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:04:10 +00:00
Bill Yi
2819fde801 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09548afe761010b4909cc3a2453d1980776d6b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:03:59 +00:00
Salud Lemus
b73edf84ff Merge "Add unit tests for verifying title" 2022-06-23 17:17:38 +00:00
Evan Chen
ad21a7ac9d Merge "Update AssociationIno creation for Bluetooth test" 2022-06-23 16:46:28 +00:00
Automerger Merge Worker
44196c08bc Merge changes from topic "am-07edb1ab4d2e477bb281d5830839cc6d" into tm-qpr-dev-plus-aosp am: 4f3d8e074c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446

Change-Id: Ibc8fbc3504d766ece891344f71c1b9563e4ddaea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:33:16 +00:00
TreeHugger Robot
c5f390ea0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 83da805299 -s ours am: fe78464128 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia72edc5ebddda439c3e63551995b8f8a513e88c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:33:09 +00:00
TreeHugger Robot
354487a721 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 9812f35a1b -s ours am: 4416ef349a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia64421596bdbaa602012510c9f1c4f871c018462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:28:39 +00:00
Bill Yi
9e216b6a9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: 679b231989 -s ours am: b6117e10c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec42d9bbd8f49226712237ccf82a9e3fbf0dfdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:28:32 +00:00
TreeHugger Robot
ad194052a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: d360cd6895 -s ours am: 096942d9ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia75ae2eb2d9b81584e71d3843079f7b1ab1935c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:28:24 +00:00
Bill Yi
6875cf37d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: f1ccac59de -s ours am: 28b04115ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bbeb4060cfd29782c9bf73de7ea4c3037fcb3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:28:18 +00:00
Automerger Merge Worker
4f3d8e074c Merge changes from topic "am-07edb1ab4d2e477bb281d5830839cc6d" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 83da805299 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: d7343cd35b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: 4f950cb0f2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: 968957026f -s ours
 2022-06-23 12:10:26 +00:00
TreeHugger Robot
fe78464128 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 83da805299 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad59b830d76eda577c824503e7a3f0d0b83261d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:09:53 +00:00
Bill Yi
ec26df1e09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: d7343cd35b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c5b90a581d18866c982dd85bc704a9da12f61b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:09:42 +00:00
TreeHugger Robot
1605b73f95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: 4f950cb0f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d25974d5c806ccbffc6946bca2c9d8ec9a75c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:09:37 +00:00
Bill Yi
7dfc2461cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: 968957026f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10c391d3b4f9f17c0886a822fa9f0d9ba302ef97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:09:33 +00:00
TreeHugger Robot
4416ef349a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 9812f35a1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3469720c2b2d793a66057e3e53b105d91946d376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:09:13 +00:00
Bill Yi
b6117e10c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: 679b231989 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99d7ff3b972f8a4811ba36bf2abe8a970cc0033d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:09:06 +00:00
TreeHugger Robot
096942d9ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: d360cd6895 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd7b333ecc505d491261e0916e994b9ec759cd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:08:58 +00:00
Bill Yi
28b04115ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: f1ccac59de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6821a13cff8548a35afa61b86eb9fe328c50dc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:08:49 +00:00
TreeHugger Robot
9812f35a1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I016a862b42c0563e77b78a84dda730514a25ee7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:46:20 +00:00
Bill Yi
679b231989 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic02005a0bb378e5e4916e094bc5d1cd2fc1bf201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:46:11 +00:00
TreeHugger Robot
d360cd6895 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee8fd197446401293b649fb866fca45375b14892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:46:03 +00:00
Bill Yi
f1ccac59de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07e7a8739655acb12d360200de06e1579aa3355e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:45:57 +00:00
TreeHugger Robot
83da805299 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf109cb516d4707651889218440e6505c1c7a2a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:45:34 +00:00
Bill Yi
d7343cd35b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3208b65b9ae16f865ea4f77029a8d0bd741ec55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:45:28 +00:00
TreeHugger Robot
4f950cb0f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4aceec2f0ed1e39fd5974f9085f71f47b6244d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:45:17 +00:00
Bill Yi
968957026f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64789bcb06aecccdbfe6a9feb0bbfd2e2e1833f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:45:10 +00:00
TreeHugger Robot
49a681bb37 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
TreeHugger Robot
f08bf7780a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
lbill
48286b8df0 Well control enrolling icon animation by UX design 
T:
* Always plays the scanning animation when user enrolling.

QPR:
* At beginning / Orientation change: Play the scanning animation until user interact with FPS
* When progress moved : Play scanning animation once
* Error : Show message(red color) to notify user

Bug: 232018092
Test: With Rare-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test: With Side-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test:  make RunSettingsGoogleRoboTests ROBOTEST_FILTER= \
"com.google.android.settings.biometrics.fingerprint.FingerprintEnrollEnrollingTest"

Change-Id: I64a1bd24260205b651036c34e6e879b59bef75cc
 2022-06-23 08:33:02 +00:00
Bonian Chen
b807ec5412 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: 2cb39cf969 am: b27361686a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I780cdd40664a2e81562fd0d15d24cad03cab4793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 05:19:00 +00:00
Bonian Chen
43f9752246 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: fef8aab672 am: 91c1a023e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I814c623796b76ee6766e845ad3bceea9c71dbb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 05:18:52 +00:00
Bonian Chen
a337d6ad37 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3 am: 0805e9efbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I9305bf7ee97701521cd40071f4925eea406e9468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 05:18:33 +00:00
Bonian Chen
b27361686a Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: 2cb39cf969 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Iaf9d3e3d082f576fb58d54de59154cc79ac6a917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 05:08:24 +00:00
Bonian Chen
91c1a023e3 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: fef8aab672 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ieab524093fcf79f22ea57b6fd1989eb6b5351f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 05:01:18 +00:00
Bonian Chen
0805e9efbf Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I321210e16c994d86824d952d04e7bb9a98e462d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 05:00:56 +00:00
Bonian Chen
fef8aab672 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I7526d262d7abb17eaae0a7ea597d8ca56a34953f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:52:13 +00:00
Bonian Chen
2cb39cf969 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Id817b88d0210b620c398b2598a954ec544548833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:52:11 +00:00
Bonian Chen
4e2c3689e3 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ib3003b99cc802e9ade9e0602de83fbc685ece742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:43:51 +00:00
Bonian Chen
e6b9bef981 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 734d1692ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ib8200b2cfd17fae9cef99c8671a1566136df1762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:43:03 +00:00
Bonian Chen
31b8174c10 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I7484149765a66e9c9beeeac1bb9dd596670a6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:27:06 +00:00
Bonian Chen
734d1692ff Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I19c92b5cf7e6463efb5a9aa822cc520855732907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:26:02 +00:00
Bonian Chen
b88828b155 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I5bd96bac8e7313ec76a461a0d4e453da90ba9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:25:38 +00:00
Bonian Chen
c5fc5db0e7 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev 2022-06-23 04:08:21 +00:00
Salud Lemus
54cb55b87e Add unit tests for verifying title 
Bug: 236259020
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest

Change-Id: I520c94818951acce25c5d8a090b6d59feff93a1c
 2022-06-22 17:18:10 -07:00
Automerger Merge Worker
50e4577787 Merge "Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 071719856d" into tm-d1-dev-plus-aosp am: 0ab3bc967d am: 899697ea05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: Iabca800074844f0d70026a485151bfe5014b9880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 23:40:44 +00:00
Salud Lemus
db1478f101 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: 26bdfebe0b am: a060b7ab4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I926dac8b780e1db455a26d858c9c2f57e545b32f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 23:40:29 +00:00
Salud Lemus
e3fa4ae94c Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: fd1d882d8d am: 416595f2dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: Ide73320e9c30cbd7972b82c42590863d91f98976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 23:40:18 +00:00