Commit Graph

101143 Commits

Author SHA1 Message Date
SongFerng Wang
61aa6e999d Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400 am: 704147041b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084

Change-Id: Ieefa077cbd80848d1d8149c71dc384775a807b0d
2022-03-17 05:00:07 +00:00
SongFerng Wang
100d741cc8 Merge "Add the battery information into device details header" am: 907b3fc4be am: 8ca446a175
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Iacf7f957deb9d3f57088c5bd49e2b0ac70cf88f8
2022-03-17 04:59:47 +00:00
TreeHugger Robot
5cf04e89a1 Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev am: 5f6aee1cf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197594

Change-Id: I0923c0c5880f7a15d3bc419aab29161abc6f67fb
2022-03-17 04:21:58 +00:00
SongFerng Wang
704147041b Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084

Change-Id: I639df2d59da6f2793bec3c89751523778f7cf35b
2022-03-17 03:52:28 +00:00
SongFerng Wang
8ca446a175 Merge "Add the battery information into device details header" am: 907b3fc4be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Id78a0d42672ff4109449951f755ac68f169dab6b
2022-03-17 03:51:56 +00:00
TreeHugger Robot
5f6aee1cf7 Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev 2022-03-17 03:44:14 +00:00
Kate Montgomery
4473f60448 Fix settings page flicker in two ways:
1. On create use UiBlocker as recommended by settings team
2. On resume only update the preferences list if the system setting has
   changed.

Bug: 220837804
Test: manual
Change-Id: Ieebd2e7fd74ab05d4fb73aede6868553d7d84af1
2022-03-17 03:32:03 +00:00
SongFerng Wang
cfb201c400 Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" 2022-03-17 03:11:24 +00:00
SongFerng Wang
907b3fc4be Merge "Add the battery information into device details header" 2022-03-17 03:11:20 +00:00
Yuri Lin
3d19e939ed Merge "Remove translatable=false from zen mode people settings footer" into tm-dev am: 9793acfafd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220597

Change-Id: Ib9c896aa646560142a6262617490eccfc0a4a7fe
2022-03-16 19:55:46 +00:00
Eric Biggers
6b37768db4 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8 am: c749aa3ed1 am: 6a8f883aee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: Ie71b246a7cc9d17dabb35f6280d110db859c49a5
2022-03-16 19:55:26 +00:00
Yuri Lin
9793acfafd Merge "Remove translatable=false from zen mode people settings footer" into tm-dev 2022-03-16 19:52:49 +00:00
Eric Biggers
6a8f883aee Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8 am: c749aa3ed1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I919c43559218b13c0f6188e04f104f3051a28731
2022-03-16 19:33:25 +00:00
Yuri Lin
4d1eb0f301 Remove preference category in zen mode alarms page
Bug: 223295009
Test: manual
Change-Id: I7afd65519dd2db61d5d39a8e5df085ec71474775
2022-03-16 15:02:27 -04:00
Eric Biggers
c749aa3ed1 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I6d5b12840e9940ecb5d076591ca8514b0085f438
2022-03-16 18:57:35 +00:00
Eric Biggers
629db5f9f8 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: Ic08831f723e777c150a672924616184af0d3299f
2022-03-16 18:34:10 +00:00
Eric Biggers
804dc16a03 Merge "Remove support for converting from FDE to FBE" 2022-03-16 18:10:30 +00:00
Treehugger Robot
7654e1fc4c Merge "Crash when scanning WiFi QR code" am: 6c31283455 am: 7950a0acaf am: 7ada247bac am: 64e4a57fa3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: Ic370e0dc30be21fe0f112b2354c3b44bc7e835e0
2022-03-16 17:27:59 +00:00
Treehugger Robot
64e4a57fa3 Merge "Crash when scanning WiFi QR code" am: 6c31283455 am: 7950a0acaf am: 7ada247bac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I02f6d022aff0740281e53d208809ca9a3b10860c
2022-03-16 17:03:37 +00:00
Treehugger Robot
7ada247bac Merge "Crash when scanning WiFi QR code" am: 6c31283455 am: 7950a0acaf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I8e31258422049429a0059159e47930c500f41ecd
2022-03-16 15:53:31 +00:00
Treehugger Robot
7950a0acaf Merge "Crash when scanning WiFi QR code" am: 6c31283455
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I0cb7773fe6c35a5d46588a64d416d5db50d9eecb
2022-03-16 15:29:30 +00:00
William Escande
cd1d375cbd API Review: factoryReset->clearBluetooth
> Consider renaming the factoryReset method to “clearBluetooth”.

Bug: 222725037
Test: TH
Tag; #refactor

Change-Id: Id42a3344b6ae1a42d0128d2a055b9710f81c4b81
2022-03-16 16:14:11 +01:00
Treehugger Robot
6c31283455 Merge "Crash when scanning WiFi QR code" 2022-03-16 15:03:41 +00:00
Yuri Lin
f3eda672e3 Remove translatable=false from zen mode people settings footer
Change-Id: Ic66112a48c8fdf5634131462f8715686cd35247b
Fixes: 223927961
2022-03-16 14:57:59 +00:00
Oli Lan
5f56a273c4 Reduce gap above user list in multiuser settings.
This fixes a large gap above the user list, which occurred because
a PreferenceCategory was used for this with a blank title.

Bug: 224659273
Test: Install and inspect
Change-Id: I82c4491cc6a5111c6517b2845b44632e0859e1b6
2022-03-16 14:57:00 +00:00
Tsung-Mao Fang
56e9b25b5f Set higher priority for ADD_DEVICE_ADMIN intent
Settings should set android:priority of the intent-filter > 1
so that regular apps can't provide an alternative.

Test: Rebuilt apk
Fix: 197960672
Change-Id: Ic12db4fa5e6a5f803930deba2a81254c375403df
2022-03-16 18:03:40 +08:00
SongFerngWang
b76eb99d4a Add the battery information into device details header
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
Merged-In: Ib9f4c388c369dc374c43dd399111e02b5555159b
2022-03-16 18:00:50 +08:00
SongFerng Wang
65bf3886a9 Merge "Add the battery information into device details header" into tm-dev am: 45436a025c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106471

Change-Id: Ibf05f749597fd931a67f3f2fa117223a5e93c70b
2022-03-16 09:54:53 +00:00
SongFerngWang
e7c89d616a [LE]Gray out the a2dp and hfp when LeAudio is enabled
1.Gray out the a2dp and hfp when le audio is enabled
2.When the user disables le audio, then the settings turn on the
  a2dp and hfp
3.When the user enables le audio, then the settings turn off the
  a2dp and hfp

Bug: 218626162
Test: build pass.
Change-Id: Ic728749112b0047cac291600b3279b9dedbf0b5a
Merged-In: Ic728749112b0047cac291600b3279b9dedbf0b5a
2022-03-16 17:51:22 +08:00
SongFerng Wang
45436a025c Merge "Add the battery information into device details header" into tm-dev 2022-03-16 09:44:42 +00:00
Yuri Ufimtsev
72f7a9f4b6 Merge "Set the Refresh Broadcast ID for Safety Event if available" into tm-dev am: 829ee90dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197110

Change-Id: I570e5c41206349044f579c9363b2e177189ffbf1
2022-03-16 09:42:54 +00:00
SongFerng Wang
58be8b3ff3 Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" into tm-dev am: 23b5565bd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17190683

Change-Id: I05e0ee9546ae4821b19dc9b4fc1dd46a67e53086
2022-03-16 09:42:47 +00:00
Yuri Ufimtsev
829ee90dd3 Merge "Set the Refresh Broadcast ID for Safety Event if available" into tm-dev 2022-03-16 09:33:26 +00:00
SongFerng Wang
23b5565bd7 Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" into tm-dev 2022-03-16 09:22:43 +00:00
David Magno
351af8ebd1 Crash when scanning WiFi QR code
Fix two crashes when scanning a WiFi QR code.
The crashes are due to the asynchronous nature of the scan/decode
process, where the result is delivered after the activity has been
destroyed.

Bug: 223640678
Test: manual, Settings -> Network & internet -> Internet
      Press the 'Scan QR code' icon
      Start to scan a WiFi QR code
      Just before then scan/decode completes, press Back
Change-Id: Ic19ca08590ed76ca9be46eabe3e0b17419fb0b44
2022-03-16 08:53:37 +00:00
Stanley Wang
ffa34e4c93 Merge "Fix the problem that the "Remove account" keyword has no search result." into tm-dev am: e8e0773d9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180789

Change-Id: I7405f956c43dc7ef83cc7afaa487c1520dc1e717
2022-03-16 08:41:46 +00:00
Stanley Wang
e8e0773d9b Merge "Fix the problem that the "Remove account" keyword has no search result." into tm-dev 2022-03-16 08:13:43 +00:00
jasonwshsu
abae445ca8 Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode.
Bug: 210593079
Test: manual test
Change-Id: Id12f7f5be24842e8c5ea4b1e15d9b9bbef881f0b
2022-03-16 16:07:56 +08:00
TreeHugger Robot
bc6229257b Merge "Update animation on storage item" into tm-dev am: 2d1c853931
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17092203

Change-Id: I584114da1acc12cecf46dee1d63b5cca3bfc4c16
2022-03-16 07:18:05 +00:00
TreeHugger Robot
2d1c853931 Merge "Update animation on storage item" into tm-dev 2022-03-16 06:46:54 +00:00
Jason Chiu
7f850294d0 Merge "Prevent scrolling after the homepage recreating" into tm-dev am: 1c8e07438a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148787

Change-Id: Ib22b1879b60ce838744907459f887cd5fc937008
2022-03-16 04:53:08 +00:00
Jason Chiu
1c8e07438a Merge "Prevent scrolling after the homepage recreating" into tm-dev 2022-03-16 04:29:15 +00:00
SongFerngWang
57dd3bc444 Add the battery information into device details header
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
2022-03-16 12:17:15 +08:00
Yomna Nasser
742e359c08 Merge "Check KEY_PREFER_2G_BOOL before showing 2G options." into tm-dev am: 4f829146a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17144311

Change-Id: I60526ffa5204d28c1cee6c588b6af74d9a370d81
2022-03-16 03:53:57 +00:00
Yomna Nasser
4f829146a2 Merge "Check KEY_PREFER_2G_BOOL before showing 2G options." into tm-dev 2022-03-16 03:30:02 +00:00
Menghan Li
e119b138d2 Merge "Fix no response after Talkback users double-tap on Learn more in Accessibility pages" into tm-dev am: 65bc1b40ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17157235

Change-Id: I31a93ca4560091773c91bae37eb47575b770cdfd
2022-03-16 03:13:44 +00:00
Menghan Li
65bc1b40ff Merge "Fix no response after Talkback users double-tap on Learn more in Accessibility pages" into tm-dev 2022-03-16 03:03:29 +00:00
PETER LIANG
171c5ecb2e Merge "Fix that the toggle of High contrast text doesn't change to turn off after tapping the Reset button." into tm-dev am: 9f9c2593ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17183508

Change-Id: I0577c50fee37d3edebaaec30b142549b6f8b2627
2022-03-16 03:01:14 +00:00
Menghan Li
03a4be2468 Merge "Minor update to the 3-button navigation steps string" into tm-dev am: 849c153afd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206763

Change-Id: I59b5f9d5f01e31bfc4b410f4d580004523017b8f
2022-03-16 03:00:54 +00:00
Menghan Li
1300aa3c29 Merge "Not show default footer strings in accessibility settings" into tm-dev am: 4e6e4c93e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206764

Change-Id: I38195d225ed422e0339fb3284975510f7f364a02
2022-03-16 02:36:16 +00:00