Commit Graph

131111 Commits

Author SHA1 Message Date
Bill Yi
5499c23607 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida4fe997bc0b5c67ee638d5ae40ef97d4d9e4428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:53 +00:00
Treehugger Robot
3cc206bb14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6db3e162b26a8ab0355ba8c39834756850a89f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:44 +00:00
Bill Yi
c8daf1ce7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b4e859b86c5039e4aebd961d5e0fd476c73cf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:41 +00:00
Treehugger Robot
9d95faadcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida72cb381d7846e1a5a2ff4d62b790d15ffbc8c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:34 +00:00
Bill Yi
3ecb491af2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I333952a9b0a5ee8f37b620f38a122f9bde4d5125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:31 +00:00
Bill Yi
99d855e12d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7dd3dbbf533a171c6a8ce4a782ed34583a27b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:29 +00:00
Bill Yi
9c5a967922 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieabe6679580ea0eb03115372f46ec06be1925f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:15 +00:00
Bill Yi
31eb96784f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If611b97ae73bba5cf7a1db9cacb0cedf4c966781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:04 +00:00
Treehugger Robot
8e3c231438 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-21 06:19:35 +00:00
TreeHugger Robot
201af568d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours am: 1bc160c342 -s ours am: 5eb79cef8c -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: I564b7cf5d8f57061ce55c8698f7a3d6355917542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:51:07 +00:00
Bill Yi
9bd02e4078 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours am: 48534e61a8 -s ours am: 4b303c23bc -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: Ib5c16baf76a8409eda6b37f3f8cf72e6c6810117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:50:59 +00:00
TreeHugger Robot
4b121489d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours am: 636c7ba7c1 -s ours am: fa3f43793d -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: Ifadaaa9e524ca7a93a0e11390c67f36033e9b1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:50:54 +00:00
Bill Yi
e21694440e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd -s ours am: 133e504b7e -s ours am: 85728f90a6 -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: Ibfdee1cd6e96b52f41091aa4fab4e6f3b4ff29b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:50:28 +00:00
TreeHugger Robot
377dcb5122 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22 -s ours am: 9d9a674b40 -s ours am: 305d40b7cc -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: If899bd8e5732731ca74aefdee2d20e12c8c5c4fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:50:06 +00:00
Bill Yi
5db711f977 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3 -s ours am: f859b36ddb -s ours am: 2de76698bd -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: I0395fa9f6f653926e47b1a1af13d78a64e575db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:49:49 +00:00
TreeHugger Robot
4b20b38673 Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: d6ae6f8655
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I11643ee9635bd968822fec312eb15870e3ec9855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:46:26 +00:00
TreeHugger Robot
6df1a755e6 Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: 87f7101866
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I8e54e0df96cc0967dd470661650cf4e3c7d9b8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:40:59 +00:00
TreeHugger Robot
d6ae6f8655 Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I8eb18e0f788a9a26da01222abd17149c350fc4ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:02:26 +00:00
TreeHugger Robot
87f7101866 Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I8ca64005b6dcdc623771de162eb6d68f7fb65808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 04:58:20 +00:00
Treehugger Robot
ef957eda5a Merge "[BiometricsV2] Refactor EnrollingRfpsFragment" 2023-06-21 04:55:47 +00:00
Treehugger Robot
2c75f0e207 Merge "[BiometricsV2] Refactor FindSfpsFragment" 2023-06-21 04:55:43 +00:00
Treehugger Robot
a9aca48fcf Merge "[BiometricsV2] Refactor FindRfpsFragment" 2023-06-21 04:55:36 +00:00
TreeHugger Robot
c548cdc4a9 Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev 2023-06-21 04:25:57 +00:00
Bill Yi
dd95a8a7c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3c3068ef9ae4cfd121798c3247328a8ebaadf22a
2023-06-20 19:30:31 -07:00
Bill Yi
d0213cd684 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7725eba9eba2160e5a330d92a312f45d677b91a7
2023-06-20 19:28:50 -07:00
Rambo Wang
330a6b2259 Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev am: de5c8613ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23745833

Change-Id: I81bd6c6a628ff71b2dbc32bd3076ec03981e6b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 02:28:06 +00:00
Milton Wu
75450f7973 [BiometricsV2] Refactor FindSfpsFragment
Refactor FingerprintEnrollFindSfpsFragment to kotlin and add bindView()
method for it

Bug: 286197831
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Side fingerpint device
Change-Id: If1c7d95e78c5be237f05209afa3ffc0b4c444c61
2023-06-21 09:56:32 +08:00
Milton Wu
00bafe9f64 [BiometricsV2] Refactor EnrollingRfpsFragment
Refactor FingerprintEnrollEnrollingRfpsFragment to kotlin and add
bindView() method for it.

Bug: 286198028
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ie271386f305003a89d7e545c289e47bbafb14a90
2023-06-21 09:54:55 +08:00
Milton Wu
ada229b409 [BiometricsV2] Refactor FindRfpsFragment
Refactor FingerprintEnrollFindRfpsFragment to kotlin and add bindView()
method for it

Bug: 286197313
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ifa11888f3e848fb7127e14ddcc41d02277163a1a
2023-06-21 09:52:35 +08:00
Milton Wu
1f2ef79fad [BiometricsV2] Refactor EnrollingSfpsFragment
Refactor FingerprintEnrollEnrollingSfpsFragment to kotlin and add
bindView() method for it

Bug: 286197400
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Side fingerpint device
Change-Id: I57fe2b07f635e9558372d003b61c419d9447f12b
2023-06-21 09:49:57 +08:00
Rambo Wang
de5c8613ba Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev 2023-06-21 01:48:56 +00:00
Candice Lo
380deaaa3b Merge changes I75d810e4,I50111f0c into udc-qpr-dev am: 290d241b1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23738691

Change-Id: I7c32cba3253b5f5811269ebe5a37099bbb8eb66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 01:20:02 +00:00
Candice Lo
290d241b1b Merge changes I75d810e4,I50111f0c into udc-qpr-dev
* changes:
  Doing null check before generating Extra Dim tooltip
  Doing null check before generating Font Size tooltip
2023-06-21 00:51:48 +00:00
Weng Su
7bd6646e5f Remove Wi-Fi hotspot from settings search for non-admin users
- Don't use ViewModel if the settings UI is restricted

Bug: 284931681
Test: manual test
atest -c WifiTetherSettingsTest

Change-Id: I3ae23b01b3be821c3560552b39cbd83ab51b2095
2023-06-21 06:58:18 +08:00
Julia Tuttle
41e2eb2261 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 87d6681e8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I0e80d27d0db9fd9cef605f8f6f511897af7d8136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 18:38:56 +00:00
Julia Tuttle
d997ade447 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: ee0d1171aa am: f5bc25cdf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ifebe3655049871518fe07073d7822a144c0d1890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 18:36:56 +00:00
Julia Tuttle
20ac28dfa2 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 205135ffa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I5550ca3651118e96d986cc714102596966a380b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 18:36:04 +00:00
Julia Tuttle
d68cf98dc7 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4e6fecc6d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I19e4f1cd8664cb6483110b8373d68f4a73977e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:51:38 +00:00
Julia Tuttle
f5bc25cdf3 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: ee0d1171aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ib47a344852d82f4fc938a5514b50d4abea4e403e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:51:36 +00:00
Julia Tuttle
87d6681e8b Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I351f38d15518deac4a5fd109b79b9ba6368d001e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:50:52 +00:00
Julia Tuttle
205135ffa4 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I4fb9af8f7ea4bf07b81b9a12034700cee6ca5905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:48:41 +00:00
Julia Tuttle
1ddbbd4542 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 2390428dd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I62ce7d8d02d54605e3115ed3abd7583ad05010be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:48:39 +00:00
Julia Tuttle
ee0d1171aa Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ieaf111aae95150c6c7480ee0693478be934d6353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:06:47 +00:00
Julia Tuttle
4d3b967fb8 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Id026252a0ef651a3ef12d1e1fdbf261368f0d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:06:35 +00:00
Julia Tuttle
2390428dd8 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Iaf0c32fc2ff4450dadc2256601d6966e5bd73d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:06:19 +00:00
Julia Tuttle
4e6fecc6d7 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I70c6b9024fe1cbb7cf37bfea71225a8bebe5df50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:06:04 +00:00
Julia Tuttle
bd74e47e5e Merge "Fix colors in importance and conversation priority preferences" into udc-dev 2023-06-20 16:21:01 +00:00
Treehugger Robot
01c4dd3eb8 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4 am: a58d63cfc7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: Ibb680bb112743989cc8f1468b08ea1e547974cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 15:58:58 +00:00
Treehugger Robot
a58d63cfc7 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I9294386b4cec4e05c6d843420313dc52a74efa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 15:20:54 +00:00
Treehugger Robot
975e782dd4 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 14:37:21 +00:00