Commit Graph

136697 Commits

Author SHA1 Message Date
Valentin Iftime
fec1996c5a [automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: b36b1dab96 am: ef71596281 -s ours am: abab7c6611 -s ours am: b8341d426c -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: I734cb8399f5ec2db27f2338b0ce39a27935840be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 02:39:49 +00:00
Valentin Iftime
7c3c764c82 [automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: 676debfb2b -s ours am: 0f9f4aa4c7 -s ours am: 9d266d7a40 -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: I25f1119bd4671d0ecc97b4696a2d7731751d7b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 02:39:20 +00:00
Valentin Iftime
b8341d426c [automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: b36b1dab96 am: ef71596281 -s ours am: abab7c6611 -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: Ib988472bf29856c705bfaf17f25d3cbee9a1d978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:53:57 +00:00
Valentin Iftime
9d266d7a40 [automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: 676debfb2b -s ours am: 0f9f4aa4c7 -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: I38419970da636ee747e072d92705482a2f030763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:53:39 +00:00
Valentin Iftime
abab7c6611 [automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: b36b1dab96 am: ef71596281 -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: Ie8a878b641e67f39e0f2cb418bedbd0a04b477a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:50:11 +00:00
Valentin Iftime
0f9f4aa4c7 [automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: 676debfb2b -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: I7e62bc8bfcbf3ccb2e9721972fe1ac9527e1e2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:22:34 +00:00
Valentin Iftime
ef71596281 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: b36b1dab96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Iaa3e61923eddada09aa19b61428ee60630b57cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:18:09 +00:00
Valentin Iftime
676debfb2b Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: I6ebd0e328707728c0eaeb49a3e8207a6fce41578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 00:34:52 +00:00
Valentin Iftime
b36b1dab96 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Ie1a755c491132beee40f05c27f5f25eb52a414c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 00:34:46 +00:00
Valentin Iftime
179f53c651 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Id029d4fd78881f7e32599f566e79b9640f3b13e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 00:04:54 +00:00
Valentin Iftime
fa932686c5 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: I2ed08af5bb3839d2a19403a6c65fd6c2c6ccce9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:49:38 +00:00
Valentin Iftime
a4a9b9f0e7 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Iaa926f8a61ba0c6e4d6511750b3e1dfe83627037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:32:36 +00:00
Treehugger Robot
bce16d7778 [automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: 8f3d594305 am: deddbe2720 -s ours am: 122c120d45 -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: I4f0cc27c71ed1686e8b84a6e5dc85660838c1921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:00:35 +00:00
Treehugger Robot
52d93dfb56 [automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: e808116b30 am: 713c324cee -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: Ibfca294a24146be8fb6ea4e833765e9e4f91a7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 20:58:47 +00:00
Manish Singh
ba6d29db7e Merge "Check all users if anyone needs a new tab" into main 2023-11-08 20:29:00 +00:00
Treehugger Robot
122c120d45 [automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: 8f3d594305 am: deddbe2720 -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991 is already in history

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

Change-Id: I7303152f782d21da9fe8f72324b387a148c08f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 20:19:03 +00:00
Treehugger Robot
713c324cee Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: e808116b30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: Iac60d9e5d71e6c544ee4b4d2224e3c2bc1cae051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 20:18:08 +00:00
Valentin Iftime
623d966fac Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Ifcec90852c0369ee58dabfd2fb9cf4f45fc2e2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 20:13:12 +00:00
Treehugger Robot
426231dfc2 [automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: 38906db8fe -s ours
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 323fbda20e is already in history

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

Change-Id: I5df68707b461604caf390d213bf4698f6b190c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 19:27:26 +00:00
Valentin Iftime
236f1a0f17 Validate ringtone URIs before setting am: 7ba175eaeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Id2d5f2423cacd7e4bb06fe46e1773b512a79fc29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 19:22:51 +00:00
Treehugger Robot
deddbe2720 Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: 8f3d594305
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: I6f6b9daa2a8794cfc7eb64217b87184f75a0e383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 19:20:14 +00:00
Treehugger Robot
8f3d594305 Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: Idefa9ae0fd0a1bbd2353d518307bf32369c1f21b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 18:46:03 +00:00
Treehugger Robot
38906db8fe Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: I4e52611bce13f21ccafddd730509f8da21495731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 18:43:52 +00:00
Randy Pfohl
27c6774f10 Merge "Updating corner gesture summary string" into main 2023-11-08 18:42:55 +00:00
Treehugger Robot
e808116b30 Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: I974f2442cb132cc97bdd843fbc3840e268f361fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 18:42:27 +00:00
Treehugger Robot
97e9b7696f Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-11-08 18:21:31 +00:00
Treehugger Robot
410fe2f16e Merge "Validate ringtone URIs before setting" into udc-dev 2023-11-08 18:05:31 +00:00
Ajinkya Chalke
e9c09d9c83 Merge "Conditionally add tail button pref" into main 2023-11-08 11:09:28 +00:00
Chaohui Wang
0e1edc6c74 Merge "Fix ContentProtectionTogglePreferenceController" into main 2023-11-08 09:05:22 +00:00
Chaohui Wang
32d9280e97 Merge "Revert^2 "Migrate to CompoundButton.OnCheckedChangeListener"" into main 2023-11-08 09:05:22 +00:00
Yuanru Qian
401d34fed9 Merge "Fix a bluetooth page footer message." into main 2023-11-08 08:45:38 +00:00
Treehugger Robot
f883aa843e Merge "Fix ListPreference title cutted off problem" into main 2023-11-08 08:42:48 +00:00
Xinyi Mao
7350779738 Merge "Add log of BatteryEvent and BatteryUsageSlot while dumpping." into main 2023-11-08 08:06:44 +00:00
Sunny Shao
b0942b61ed Fix ListPreference title cutted off problem
- Remove the code of the setSingleLineTitle.
- Remove the additional code in the SpellCheckerPreference.

Fixes: 306795084
Test: manual test
Change-Id: Ib279496b9456cab9df9c542b8fee455d28ef01d9
2023-11-08 15:54:11 +08:00
Yuanru Qian
d56ed8b7ae Fix a bluetooth page footer message.
Bug: 300648205
Test: Compiled
Change-Id: I3040a7c886332159576ab9b0a6abeca606e511c5
2023-11-08 07:51:26 +00:00
Yiyi Shen
0a5bbd34b9 Merge "[Audiosharing] Add audio sharing section to Connected devices page." into main 2023-11-08 07:33:09 +00:00
Chaohui Wang
2284e5a7a4 Merge "Limit wifi item edit content's max length to 500" into main 2023-11-08 07:04:55 +00:00
mxyyiyi
56aa92f7c4 Add log of BatteryEvent and BatteryUsageSlot while dumpping.
Test: manual
Bug: 294945588
Change-Id: If3cb4a4014d20f0d0c6275f54d141c1bdb4ac962
2023-11-08 14:46:52 +08:00
Chaohui Wang
972a94a374 Merge "Prevent Erase SIM during call" into main 2023-11-08 06:11:30 +00:00
Yiyi Shen
2f2afa22fd [Audiosharing] Add audio sharing section to Connected devices page.
The section will show up during a sharing session.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I59cf81b35dcbf328b253d72d7fdc86af450251ee
2023-11-08 13:41:05 +08:00
Yiling Chuang
c57d1ef69a Merge "Provide the flexibility to add more tip detector" into main 2023-11-08 04:51:57 +00:00
Faye Yan
af9bbb9faf Merge "Filter out apps that are not pre-granted with voice activation permission for voice activation apps." into main 2023-11-08 04:40:48 +00:00
fayey
3c533755ec Filter out apps that are not pre-granted with voice activation
permission for voice activation apps.

Bug: 306447565
Bug: 303727896
Bug: 309677303
Test: presubmit
Change-Id: Iecdfdb158029e139283233cbfbae7b405a916f24
2023-11-08 03:24:44 +00:00
Chaohui Wang
478ab50c01 Prevent Erase SIM during call
By collecting call state and only enable preference when idle.

Fix: 298893271
Test: manual - on Mobile Settings during call
Test: unit tests
Change-Id: Ifd567a6b68a3efbb0b42bfa0233f7c54eca07ae1
2023-11-08 03:08:56 +00:00
Yi-Ling Chuang
ac8925518a Provide the flexibility to add more tip detector
Bug: 309054332
Test: robotests
Change-Id: I650141072b6de6c4dcdbbb853fb9997295d6e929
2023-11-08 10:39:59 +08:00
Bill Yi
abc050a0a2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I66cc124b528ef022b1df904cbacb92fb6bc8744f
2023-11-07 18:26:56 -08:00
Treehugger Robot
a1903353da Merge "Scroll-down after click accessiblity button" into main 2023-11-07 22:52:21 +00:00
Randy Pfohl
2aeff64425 Updating corner gesture summary string
Test: Built and ran locally

Bug: 308421854

Change-Id: I395628a66f032f5f99c8060b4c142ff4c0a2d7d1
2023-11-07 22:45:13 +00:00
Ajinkya Chalke
15c617625a Conditionally add tail button pref
- The connected device settings shouldn't show the tail button pref
  setting if the input device doesn't support it.

Bug: 293472525
Test: atest StylusDevicesControllerTest
Flag: NONE
Change-Id: I50ab43e971b0dd8530a5bdab8544a46e889366ee
2023-11-07 17:39:29 +00:00
YK Hung
b75a956c10 Merge "Update the constant fields in the BatteryOptimizeUtils" into main 2023-11-07 16:27:32 +00:00