Commit Graph

123236 Commits

Author SHA1 Message Date
Marcelo Arteiro
52f43dfdf3 Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39 am: 379150e898
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598

Change-Id: I2ffb6538b1f01e15af2dc0543d0c332f8ee7e280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:32:11 +00:00
Vania Januar
4194cf1c5d Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a am: d673f304c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282

Change-Id: I4b8b35b932c158b9e98779e4486be82cffa5f1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:29:42 +00:00
Automerger Merge Worker
218fa19f35 Merge "Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b am: d250ee1a8b" 2023-04-13 02:29:37 +00:00
Bill Yi
4f095e6d23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours am: e5a98b540e -s ours am: 4c6996b55c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I132b41fb8abc7caf4d984b5de5a1ad5b3fbb0038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:26:52 +00:00
Treehugger Robot
87d90cc1c4 Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b am: d250ee1a8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839

Change-Id: I49b5265140364d99ac67867828a0efb97b7017c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:26:48 +00:00
Automerger Merge Worker
0677736292 Merge "Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd am: 9e28310519" 2023-04-13 02:26:42 +00:00
YK Hung
c229716c6d Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd am: 9e28310519
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802

Change-Id: Ibfb95f2e9dcf632da581bf045149d818a01b62f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:26:36 +00:00
Hao Dong
e382c39e38 Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94 am: e5946f6858
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994

Change-Id: Ied41df2285a984d0cc9220244f7208acf40dca8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:26:15 +00:00
YK Hung
f4d44bcfff Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56 am: 3c47574638
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805

Change-Id: I8f7828fb51361ff560984b1de0320b234e7adb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:26:04 +00:00
Treehugger Robot
e3c1bbf359 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573 am: 7bf829b4a6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: Ica0b365494d5d14acfddeb84dd83b28e81b13e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:23:22 +00:00
Marcelo Arteiro
ba9e9abaa5 Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39 am: ad2457b1ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598

Change-Id: I8afb28969ddcb6b45656e4a1f0a30bdd63b37fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:21:51 +00:00
Vania Januar
c7329bf42e Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a am: a24e7dc12a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282

Change-Id: I836cfd095b654ef4b55abb1474a19cd4ced4f1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:20:27 +00:00
Treehugger Robot
b6f09d0f91 Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b am: 5a88b6f2ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839

Change-Id: I3c412e417aab68353affa987f73c579deea523c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:18:21 +00:00
YK Hung
cb1c18f1c6 Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd am: d02dc7bf44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802

Change-Id: Ie6be75840c35f2cba9a4c60041af91a8e56b09ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:18:06 +00:00
David Liu
a4f9cb80eb Merge "Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a am: 65136fa9f8 am: 9c86b7c1eb" 2023-04-13 02:11:08 +00:00
David Liu
4090ddf0c8 Merge "Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a am: 65136fa9f8 am: dd39b890a9" 2023-04-13 02:07:38 +00:00
David Liu
72ebcab7e9 Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a am: 65136fa9f8 am: 9c86b7c1eb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: I54d52e4a8d781bbf76364f4077980fd9a9b08269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
BUG: 277883465
2023-04-12 20:19:32 +00:00
David Liu
8af079db60 Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a am: 65136fa9f8 am: dd39b890a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: Ib2394ee6cef1d8fffdce34d0e8a293a34a35de6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug:277864768
2023-04-12 20:18:44 +00:00
Treehugger Robot
7afb2d4440 Merge "Remove unused MagnificationPreferenceFragment and its related controllers" 2023-04-12 19:33:30 +00:00
Bill Yi
4c6996b55c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours am: e5a98b540e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibdb7a90dd2e56fae76a269bf78479cc306e6177a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 19:05:43 +00:00
Bill Yi
e5a98b540e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2624e36dfdad37be6f90c209d4ea96e5e1db7a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 19:02:18 +00:00
Hao Dong
e5946f6858 Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994

Change-Id: I8e08c8cb75e1ae7c794be59081b12c48a79f0735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 18:30:51 +00:00
Hao Dong
ad5954bc94 Merge "Fix biometrics unicorn consent string bug." into udc-dev 2023-04-12 18:02:16 +00:00
YK Hung
3c47574638 Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805

Change-Id: I75cc6c46eaa0fdb5436a600ccd70d851417e2c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 16:11:29 +00:00
YK Hung
e4c3f68b56 Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev 2023-04-12 15:43:48 +00:00
Treehugger Robot
2421846dc1 Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639 am: 120dea4cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762

Change-Id: Ieb773c8586317c868deaeccdbfffbf5e68027be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:52:17 +00:00
Treehugger Robot
c58f9ad608 Merge "Fix empty icon while tapping Auto-rotate screen widget" into udc-dev am: 104e412077 am: fc8eefe521
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569799

Change-Id: Ia70ec9d50c536d186c3fa47e5d46ab47e81e1538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:42:34 +00:00
YK Hung
3529a1708f Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78 am: 65f1cf5f6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849

Change-Id: I6e130e7d049dfcdb9357d8f4451d14f4968e4152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:41:09 +00:00
Chris Antol
b247380daf Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2 am: 8780cc2711
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945

Change-Id: Ib67567d558a7cc7aae162169e7795a00c78802c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:37:20 +00:00
Quang Luong
d1a817fd4e Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523 am: 66e88d7802
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593

Change-Id: I695c3be4fb232378da19ee6a7afb7d86efdfec06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:34:41 +00:00
Marcello Galhardo
39cdff5066 Merge "Add Note Task Shortcut to Settings" into udc-dev am: 211b544ea8 am: 44a2cf0d2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252424

Change-Id: I408989611212acb1386edb623cd7354b07189603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:31:13 +00:00
Treehugger Robot
8745d8ea1f Merge "[Panlingual] set direction and textAlignment for the locale dialog" into udc-dev am: ef65b4c580 am: af0bce92de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572956

Change-Id: I3f54da8bccda89d28384cc8dbcbe7b3ad40192d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:24:35 +00:00
Treehugger Robot
7bf829b4a6 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: I4ff3013a2cfe2f8839f542383333a8de3b40e3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:23:54 +00:00
Treehugger Robot
423bfef9c8 Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev am: d81b473fe0 am: 672d1ce1fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550313

Change-Id: Iaf33fe3131d7941bc87f8ee896cd5ba3be5a6c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:17:14 +00:00
Daniel Huang
174c1faf4e Merge "The dialog should persist after rotation." into udc-dev am: 74042f59de am: fab7adefc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568598

Change-Id: Id08f323bb94914749cdecb34f376367ac3a9567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:16:06 +00:00
Edgar Wang
8bf2b8aacf Disable developer options when development_settings_enabled is disabled am: b5774a8e2e am: 0eb7d1b9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562950

Change-Id: I9a6a4d8b1dca8f0719486094f6f8107d18ba90a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:13:24 +00:00
Angela Wang
410eff4ba6 Merge "Fixes Flash Notification preview button alignment issue in RTL layout" into udc-dev am: 11648c709e am: 1eedddc90d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550307

Change-Id: Ia6ed397b398f485223b56f0e9c83e1ea82e9f313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:06:55 +00:00
Marcelo Arteiro
379150e898 Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598

Change-Id: If434fe73a3b2147a3bc8dba04f139b6aacaeac84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:06:19 +00:00
Vania Januar
d673f304c1 Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282

Change-Id: I59a735c841520363fe6d3ef54b3d8211fadd879f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:05:33 +00:00
Treehugger Robot
d250ee1a8b Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839

Change-Id: I2502ce3c6d41cafc1f5d1012f4ab315c3e1f209a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:04:46 +00:00
YK Hung
9e28310519 Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802

Change-Id: I6d9edbd4191811b450be945c0703e14cf03b83b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:02:30 +00:00
David Liu
9c86b7c1eb Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a am: 65136fa9f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: Id41cecc98381059d6e0d414a3e6909c47b62621b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:01:30 +00:00
Treehugger Robot
120dea4cf6 Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762

Change-Id: I9aa93ca9c0c9e811c345e61e9ef55e0954343d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:00:31 +00:00
Treehugger Robot
fc8eefe521 Merge "Fix empty icon while tapping Auto-rotate screen widget" into udc-dev am: 104e412077
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569799

Change-Id: I044c7db276c59a3aaffb157e0755e9790bdb2c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:59:24 +00:00
YK Hung
65f1cf5f6f Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849

Change-Id: I66ebf1e46fa4244b8ebfe09ebde9cd28e6ac4011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:58:29 +00:00
Chris Antol
8780cc2711 Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945

Change-Id: I0e013606d565e29451497aa1bd609be85a2447a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:57:51 +00:00
Quang Luong
66e88d7802 Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593

Change-Id: I87cee1e5ae0505b09979f99a9ded17975d8f175e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:57:07 +00:00
Marcello Galhardo
44a2cf0d2f Merge "Add Note Task Shortcut to Settings" into udc-dev am: 211b544ea8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252424

Change-Id: Ifc7bd75a22cae569c03d22eabe03b0e24f6d3be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:53:49 +00:00
Treehugger Robot
a7152b9573 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: Ic9c46e521d8ae7b85dc63fa593e5f05951f596a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:51:42 +00:00
Treehugger Robot
af0bce92de Merge "[Panlingual] set direction and textAlignment for the locale dialog" into udc-dev am: ef65b4c580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572956

Change-Id: Ib98254ecf74e732bbca106ca0fe05950ae504632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:51:15 +00:00