Bill Yi
cb2bb50cd2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-13 05:04:31 +00:00
Bill Yi
aac929ea24
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-13 05:04:31 +00:00
Bill Yi
0dc9c8274b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-13 05:04:31 +00:00
SongFerng Wang
48d04ef4d3
Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808
Change-Id: I6d70e0298d4c796a1e607f707ec4fb496e913c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 04:36:22 +00:00
SongFerng Wang
133fe9fbc7
Merge "Fix the IndexOutOfBoundsException" into udc-dev
2023-04-13 04:12:32 +00:00
Varun Shah
0c31c38a9e
Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865
Change-Id: Ib76cebb5a301b41be1b4a6e95ae50fff38020ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:51:28 +00:00
Varun Shah
4cf335d53c
Merge "Update the default wellbeing package config." into udc-dev
2023-04-13 03:38:10 +00:00
TreeHugger Robot
83692baf4d
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807
Change-Id: I44d88661d9eb68d745e7953df945236c965c10f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:48:13 +00:00
TreeHugger Robot
70ef00405c
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev
2023-04-13 02:16:15 +00:00
Daniel Huang
a52ac4eae7
Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537
Change-Id: Id2b7c87824c9083eed865a884740d02e483872f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 01:03:07 +00:00
Daniel Huang
6e55a52559
Merge "Use ScrollView to include the full layout." into udc-dev
2023-04-13 00:41:45 +00:00
Treehugger Robot
35f746dade
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours am: 2f0557495d
-s ours am: d1267c1675
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I0aeadf6ca795d190aa3cffd41e2dfec30620a40d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 21:08:48 +00:00
Treehugger Robot
d1267c1675
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours am: 2f0557495d
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I748bb0da37a29aca390990332e5872deb256b16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:57:11 +00:00
Treehugger Robot
2f0557495d
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: Iff5558b9267a6282536f16601d67959e58c347d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:23:01 +00:00
Treehugger Robot
635c0e08ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a
-s ours am: dacb81d743
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I88ad49353eff47f0239be1aac51a363b652ab0c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:02:17 +00:00
Bill Yi
c3dfe52e8c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b
-s ours am: d145911bf1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I74fc31cfde77ec3ed3c2e876c38f2667661bbd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:01:54 +00:00
Treehugger Robot
dacb81d743
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I820a1cf4aa87dfc27dd707a5580cdb2bc77dda7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:48:15 +00:00
Bill Yi
d145911bf1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: Idd2d1235c08bc145d4570476875db69efc8d9843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:47:52 +00:00
Bill Yi
9a1fe79b1a
[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: I3407f4ca3a464571d6523f94e84b0a92508d2be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:20:10 +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
Treehugger Robot
5d93cea1c7
Merge "Merge TQ2A.230405.003" am: fd8670a4c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I2ebe468438118d275db0ee38a0c0c624207bd771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:00:58 +00:00
Treehugger Robot
8e95c6e66a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-12 18:38:34 +00:00
Hao Dong
cc0d6acce1
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: Ibc09759d1c9e30380e2f144fb425b8be92e191be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 18:36:00 +00:00
Hao Dong
ad5954bc94
Merge "Fix biometrics unicorn consent string bug." into udc-dev
2023-04-12 18:02:16 +00:00
Treehugger Robot
fd8670a4c1
Merge "Merge TQ2A.230405.003"
2023-04-12 17:22:25 +00:00
ykhung
836dc0d76c
Remove plug/unplug condition for the incompatible charging
...
Remove the plug/unplug condition checking for the incompatible
notification based on the feedback from:
https://b.corp.google.com/issues/276403405#comment3
Bug: 276403405
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: Iec177ed33a3cc8cf5a5747b6f65440d31120823c
2023-04-13 00:29:11 +08:00
YK Hung
26b8b4c088
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: I237ffcc54e6833e55feb85078e5c5df6629f2718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 16:11:34 +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
SongFerngWang
4c206e1a11
Fix the IndexOutOfBoundsException
...
Bug: 276460284
Test: build pass
Change-Id: If70bd4624b9b94aafa0930f0deba106cff5a2212
2023-04-12 19:50:51 +08:00
Treehugger Robot
c366b8381c
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: I813ae375553a4082504ccf4b564f78815764a43e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:06:35 +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
Treehugger Robot
672d1ce1fe
Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev am: d81b473fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550313
Change-Id: I0871a68ff0926c245b8bbe9199adb7164cc2a2e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:48:37 +00:00
Daniel Huang
fab7adefc3
Merge "The dialog should persist after rotation." into udc-dev am: 74042f59de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568598
Change-Id: I06351395777f82ccac69ed163b2c13284df12d8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:21:23 +00:00
Edgar Wang
0eb7d1b9de
Disable developer options when development_settings_enabled is disabled am: b5774a8e2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562950
Change-Id: Ib7bc2d9048c760ad3ce34efc2cac3f3e392e3db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:18:54 +00:00
Treehugger Robot
525b567db3
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a
am: ff6def3c7c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: I4dfc995e7185c5cb7a599156d71a198bd434cb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:18:17 +00:00
Angela Wang
1eedddc90d
Merge "Fixes Flash Notification preview button alignment issue in RTL layout" into udc-dev am: 11648c709e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550307
Change-Id: Iec82c984181e8f50efbb21d2af6e3f30bbf54c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:15:12 +00:00
Marcelo Arteiro
cab738bf39
Merge "Fix for Check mark color on Regional preferences" into udc-dev
2023-04-12 10:05:10 +00:00
Marcelo Arteiro
df3bf351cd
Fix for Check mark color on Regional preferences
...
https://screenshot.googleplex.com/BkRTpomGg7oXP6C
Test: Manual
Fix: 272398108
Change-Id: Ic762215e35058731ddbd3ea042cb14e0a135793c
2023-04-12 10:04:47 +00:00