Commit Graph

116048 Commits

Author SHA1 Message Date
Bill Yi
567a7c5d42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours am: c2faa5ccc6 -s ours am: c35d911038 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibbe049dc774c8680f77330420b08c951ee267355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:00:12 +00:00
TreeHugger Robot
7e76b60942 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours am: ac92abd818 -s ours am: 25e883d9fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ac4bddc4541da1e0183f97b7b56dc6362ddd8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:42:39 +00:00
Bill Yi
f783c81dae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours am: ac8e5a5efd -s ours am: 48cbbe67a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6387fd37f31902e7d8d200524c3910660b3f902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:42:37 +00:00
TreeHugger Robot
a4a7840b5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours am: e0e3ca6646 -s ours am: 0f05dd22b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13088e04fa53c56ba5a5f5e9c0fcb74c4e9783a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:42:34 +00:00
Bill Yi
c4b90a2a34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours am: d86bb6ee9f -s ours am: 507a7d4c0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79a84a1f14fbfa48fb19f6a524125052e081d0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:42:21 +00:00
TreeHugger Robot
f9092ed4a4 [automerger skipped] Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev am: 53f1e23d63 am: 9a4844c2a9 -s ours
am skip reason: Merged-In If536c93652506c8009f5cabf3d0ae373b6825bfc with SHA-1 1051fb16d8 is already in history

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

Change-Id: Icb4c42aae638dbb59fd46ad92d74520b88dd8934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:35:40 +00:00
Binyi Wu
e0a1ba9463 Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev am: effd45b308 am: b2aa91a331
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19852695

Change-Id: I9aee9ecb42c05fadf7bfc7b2345644e32b72dd0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:35:26 +00:00
Bill Yi
c35d911038 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours am: c2faa5ccc6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I840143c3a5fcf005fd8dd54a8bdc971324679de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:35:02 +00:00
TreeHugger Robot
25e883d9fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours am: ac92abd818 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6e7c9b7a11512c20acde0eb72178bb32992d5aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:26:47 +00:00
Bill Yi
48cbbe67a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours am: ac8e5a5efd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic73fc02d563d54fe5021a33891f89103c86aec89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:26:42 +00:00
TreeHugger Robot
0f05dd22b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours am: e0e3ca6646 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f12e85c006d849bd7a8ffc0e4addc57d73f6735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:26:30 +00:00
Bill Yi
507a7d4c0c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours am: d86bb6ee9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I828c752de1880ea14e0eb563163cd126959dd448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:26:22 +00:00
TreeHugger Robot
9a4844c2a9 Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev am: 53f1e23d63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949396

Change-Id: Id8871a6434f46e39f9814490c6cb85eb9529d50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:22:16 +00:00
Binyi Wu
b2aa91a331 Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev am: effd45b308
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19852695

Change-Id: I682ca9613cd67d56d1a6b8882b986abe15f140b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:20:43 +00:00
Bill Yi
547d4fbec4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 198cb56664 -s ours am: f50089ff29 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82b7035db7135208c50267f8ce055ca753b337bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:47:08 +00:00
Bill Yi
adb10074f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c3126868 -s ours am: b932690ae7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20e48c87d3ff606a96c601f5f5aaf283ef635a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:47:02 +00:00
Bill Yi
c2faa5ccc6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b2953e71ef984f008f2fc2762d5fe3804f6b702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:46:41 +00:00
Bill Yi
f50089ff29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 198cb56664 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I594d9d0cc861b7774b4afe32a5f3586fa465172a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:42:44 +00:00
Bill Yi
b932690ae7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c3126868 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7a769015229ca99524253c2d8cacef3b94c652e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:42:22 +00:00
Bill Yi
b3eb58984a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9b31b981ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc1e197bd2075173ade23841b6ea1fcef5add4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:37:57 +00:00
Bill Yi
4cc290a600 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d4259833d -s ours
am skip reason: subject contains skip directive

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

Change-Id: If35261a464ce2ddba84591214a24f30e1ce64843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:37:52 +00:00
Bill Yi
9cc6bc637f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If23cbcb75bb7c7101a7a40943082b78c90d0ad99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:33:57 +00:00
TreeHugger Robot
ac92abd818 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I37b11ce456cd9165250295ac7052be3edc13b868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:33:08 +00:00
Bill Yi
ac8e5a5efd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If53f0cbd33af90bac023c46636cc1e705e9a33bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:33:00 +00:00
TreeHugger Robot
e0e3ca6646 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I200fba460875d49b6864e06de995d910e0315671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:32:51 +00:00
Bill Yi
d86bb6ee9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie276d18775fac66211a1a7f2f7445324aa3fb923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:32:41 +00:00
Grace Cheng
cd17b27cdf Merge "Fix alignment of finger animation with progress bar" 2022-09-21 20:32:06 +00:00
Quang Luong
1b233b37c3 Merge "Do not request P2P if user declined interface conflict dialog" 2022-09-21 16:24:37 +00:00
Jason Hsu
a1cb4fd446 Merge "Fix not on the top when entering device detail page" 2022-09-21 14:50:32 +00:00
Bill Yi
9b31b981ef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-09-21 14:22:42 +00:00
jasonwshsu
cfec092373 Fix not on the top when entering device detail page
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.

Solution: That SpacePreference should only be visible when the device is
hearing aid.

Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Change-Id: Ic0be940c8466b5e1e301255868c29d06bd4428bd
2022-09-21 16:00:12 +08:00
TreeHugger Robot
53f1e23d63 Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev 2022-09-21 05:50:45 +00:00
Binyi Wu
effd45b308 Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev 2022-09-21 04:14:11 +00:00
Bill Yi
1960044a5f Merge changes from topic "tc_change_22092009_25"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 66d46968f6
  Import translations. DO NOT MERGE ANYWHERE
2022-09-21 02:29:11 +00:00
Bill Yi
cab02b9442 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-21 02:26:30 +00:00
Bill Yi
39f39c9514 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-21 02:26:30 +00:00
Bill Yi
198cb56664 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-20 22:47:08 +00:00
TreeHugger Robot
85702ae62d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-09-20 21:00:30 +00:00
TreeHugger Robot
f33a95d6f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-09-20 21:00:30 +00:00
Quang Luong
0fe65b582a Do not request P2P if user declined interface conflict dialog
P2P iface requests may prompt the user to accept/decline. We should avoid prompting the user twice by not making any additional P2P iface requests after the user declines (i.e. device becomes unavailable).

Bug: 243436630
Test: enable iface creation dialog and turn on STA + AP, verify dialog
does not reappear after user reject in P2P Settings

Change-Id: I6fdda273d898c1d456a1f39d90b1257c8ff4de15
2022-09-20 17:44:57 +00:00
Bill Yi
557410d5c8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 66d46968f6
Blank merge reason: commit message contains skip directive

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

Change-Id: I2cc1d8aff8925ec56f542eced43799d35ba9f84f
2022-09-20 17:08:41 +00:00
Grace Cheng
415314113b Fix alignment of finger animation with progress bar
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment

Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:13:14 +00:00
Sunny Shao
535667b5eb Fix checkcolor_hook error
Bug: 247692342
Test: repo upload OK
Change-Id: Iaabad7081d216cb8074f3d26a1213b8230da3602
2022-09-20 19:36:11 +08:00
Amy Hsu
d71e9f4427 Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5 am: b13a190ef7 am: 352ee9eeef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206

Change-Id: I4d0d2efc974286b398c0fbcfbb738c958222d898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 09:57:52 +00:00
Amy Hsu
ab9a73ff07 Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5 am: d434100421 am: 4da27ff2bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206

Change-Id: Id9493be0c48bcc3e31272fc0dd0f155a18161fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 09:57:20 +00:00
Amy Hsu
352ee9eeef Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5 am: b13a190ef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206

Change-Id: I46e83a4ff523a6762a6ee40c970d732a0920fc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 09:43:33 +00:00
Xuanang Zhao
db0a0792a1 Merge "Rename the shortcut title for dark theme from "Schedule" to "Dark theme"" 2022-09-20 09:31:34 +00:00
Amy Hsu
4da27ff2bd Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5 am: d434100421
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206

Change-Id: I589ef3fb4fc332af6e5f6b655b97a63ba18d8c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 09:27:38 +00:00
Amy Hsu
b13a190ef7 Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206

Change-Id: I206b788c8985b7ebc20093275ed4d1c272349e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 09:03:38 +00:00
Amy Hsu
d434100421 Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206

Change-Id: Ibb4eb46ab387682f595162414c4ecb4f2dad5c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 09:03:37 +00:00