Commit Graph

101456 Commits

Author SHA1 Message Date
Yuri Lin
7b19287f31 Merge "Remove translatable=false from zen mode people settings footer" into tm-dev am: 9793acfafd am: 3d19e939ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220597

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

Change-Id: I46632f86a9feaac618541c9563317f9039ea543f
2022-03-16 20:15:00 +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
Yuri Lin
003049ce20 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: Id71f9c7ac104bd1140008648308a7d62caea5b55
2022-03-16 19:55:39 +00:00
Eric Biggers
f755f6fde9 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: Ib07f915c728fa3a00861aa14d4b3d77e3e78f173
2022-03-16 19:55:29 +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
Treehugger Robot
1fa8601a9e Merge "Crash when scanning WiFi QR code" am: 6c31283455 am: 7950a0acaf am: 7ada247bac am: 64e4a57fa3 am: 7654e1fc4c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: If1b4d5be4936a6b91656d5b2380f50ab6d757700
2022-03-16 19:10:01 +00: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
SongFerng Wang
edac87823c Merge "Add the battery information into device details header" into tm-dev am: 45436a025c am: 65bf3886a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106471

Change-Id: I2c2b783cece121bf2a2dcead8c58c153f6038da7
2022-03-16 18:36:24 +00:00
Yuri Ufimtsev
ee072e47d4 Merge "Set the Refresh Broadcast ID for Safety Event if available" into tm-dev am: 829ee90dd3 am: 72f7a9f4b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197110

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

Change-Id: Ida07a57de7e1a7061b1dc0b657fc7614872414f1
2022-03-16 18:36:01 +00:00
Stanley Wang
400d221916 Merge "Fix the problem that the "Remove account" keyword has no search result." into tm-dev am: e8e0773d9b am: ffa34e4c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180789

Change-Id: I6d177cbaa51eb4ae2c29c3207cd8a3f713c53fe5
2022-03-16 18:35:48 +00:00
TreeHugger Robot
758de981fe Merge "Update animation on storage item" into tm-dev am: 2d1c853931 am: bc6229257b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17092203

Change-Id: I50b5e8fc22df8d8a681914baab98ce3fcb9dccfe
2022-03-16 18:35:33 +00:00
Jason Chiu
67e1647033 Merge "Prevent scrolling after the homepage recreating" into tm-dev am: 1c8e07438a am: 7f850294d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148787

Change-Id: I72477eb010164d12d22b755bab1b09aeeff26b17
2022-03-16 18:35:18 +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
Yomna Nasser
16490954fb Merge "Check KEY_PREFER_2G_BOOL before showing 2G options." into tm-dev am: 4f829146a2 am: 742e359c08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17144311

Change-Id: I6f6ddb39f6d69442b818ef8fbd4428708cd0a9a9
2022-03-16 18:08:24 +00:00
Menghan Li
e7a3f598fc Merge "Fix no response after Talkback users double-tap on Learn more in Accessibility pages" into tm-dev am: 65bc1b40ff am: e119b138d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17157235

Change-Id: I814e3fbb8cc55f0c801c6ff8b2dd0d379561faf4
2022-03-16 18:07:57 +00:00
PETER LIANG
3269579d69 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 am: 171c5ecb2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17183508

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

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

Change-Id: Ia49ca70e4edb3eaa8e418e8513ee6ac139e72c3d
2022-03-16 18:04:23 +00:00
Joshua Mccloskey
2f1a91cfc0 Merge "Updated fp enrollment to have 5 enroll stages." into tm-dev am: 5b8d645a99 am: 0494709820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17189876

Change-Id: I3c9ed711e60154e0df2b3f8d8e61675fdeff3724
2022-03-16 17:37:02 +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
03ef315d89 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: Ib67a5f8dddfe2f9356c127dd08c6b2079b2b9363
2022-03-16 17:27:53 +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
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
SongFerng Wang
124eaf87ac 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: I60cafbb7b335d36d3651af260d4827178baae747
2022-03-16 09:55:40 +00: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
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
Yuri Ufimtsev
3ed877ffe9 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: If6a2bbb6a6dcf5d51c81a3dc341ad69234b3c46b
2022-03-16 09:42:50 +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
SongFerng Wang
e291906b78 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: Ie58e9e56e195d9479da1eabeed8a2578936b6c96
2022-03-16 09:42:39 +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
ff9cfdc7ad 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: Ie986018773f1d2f805d196acf54b6c2791f6209a
2022-03-16 08:41:43 +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
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
e23ad01824 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: If9d29b30f37e99467fd49de9144f9127a2f1ac8b
2022-03-16 07:17:33 +00:00
TreeHugger Robot
2d1c853931 Merge "Update animation on storage item" into tm-dev 2022-03-16 06:46:54 +00:00
Jason Chiu
2c4edd5512 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: I90043af7b684b956881f9fa8fd84ba1e920f5050
2022-03-16 04:53:12 +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