Commit Graph

41612 Commits

Author SHA1 Message Date
TreeHugger Robot
beb1fdc345 Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529

Change-Id: Ie27bb45432f30b16e2045b87c89901eeda327b2a
2022-03-19 02:39:13 +00:00
TreeHugger Robot
70e2ed1b9d Merge "Hide emergency setting from "Search settings"" into tm-dev 2022-03-19 02:22:59 +00:00
Treehugger Robot
9448fe3278 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149 am: 4463829319
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ia24ee9964b2f5eed87add34af4bdaa87b75ca708
2022-03-18 23:42:53 +00:00
Treehugger Robot
4463829319 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ibe6ef9677e7892448000bb2d83501258dacd57d9
2022-03-18 23:24:19 +00:00
Treehugger Robot
bbb9db4149 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ie97da8acc7f25ae088d9ef36932aeb93be30b7cd
2022-03-18 23:11:21 +00:00
Kweku Adams
6ff3a5e686 Merge "Make action constants configurable." into tm-dev am: 696010b0c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260256

Change-Id: I1910a7aa9c45398184800f542372685492fc28a8
2022-03-18 22:17:01 +00:00
Kweku Adams
696010b0c5 Merge "Make action constants configurable." into tm-dev 2022-03-18 22:04:56 +00:00
Giulio Fiscella
d5d6846846 Merge "Use new severity levels and builders" into tm-dev 2022-03-18 22:00:01 +00:00
Kweku Adams
6525ff3d79 Make action constants configurable.
Make it possible to configure the base price and cost to produce of all
supported actions.

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: I2dcd3382f7404655fb0d10538a426071c157ea18
2022-03-18 18:54:00 +00:00
Yibo Wang
e20ddfa5f4 Add null check for mChannel object in WifiP2Settings
When user switch between settings of hotspot(Enable hotspot),
Internet(Enable Wifi) and Wifi-Direct(establish, disconnect and
forgot P2P connection).

mChannel becomes null during WiFi P2P user scenarios resulting
in Settings(com.android.settings) crash on enable Wifi.

This commit fixes mChannel IllegalArgumentException: Channel
needs to be initialized.

Test: manual test
Bug: 218608961
Change-Id: I72c67bcd1086afe2aa8d2c5521107e2d38e5b0bb
2022-03-18 15:08:51 +01:00
Giulio Fiscella
95e5170354 Merge changes from topic "cherrypick-scIntDefs-s2hgwk1y41"
* changes:
  [automerge] Use new severity levels and builders 2p: 3612e9e440
  Use new severity levels and builders
2022-03-18 12:32:10 +00:00
Patrick Huang
8f1e3fec84 Hide emergency setting from "Search settings"
Use the same config value created in ag/16497464 and ag/16497621
to determine if emergency setting should be searchable in Settings.

Bug: 220437126
Test: Manual test on affected phone and tablet
Change-Id: I964dd9f75f6a5c3b239aabfa4dfce84cb75c8565
2022-03-18 06:51:31 +00:00
Arc Wang
a21f277aae Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: Id15bae613192941fbeab31ba7ad8d7044e732370
2022-03-18 06:14:55 +00:00
Arc Wang
f8e0b152ad Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev 2022-03-18 05:56:51 +00:00
danielwbhuang
b237247505 [Panlingual][patch] Settings UI revamp - Navigation handling
Fix the logic of checking mPreferenceKey

Bug: 223090378
Test: local
Change-Id: Iea9874463d1786fce2307f3db295ac2bdff27ac3
2022-03-18 03:29:05 +00:00
Kate Montgomery
2d570febb1 Merge "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." into tm-dev am: 798a0fab9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772

Change-Id: Ib17152dbc29a9cc0588607966da310e53cdba4bb
2022-03-17 19:46:34 +00:00
Kate Montgomery
798a0fab9c Merge "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." into tm-dev 2022-03-17 19:14:04 +00:00
Giulio Fiscella
9112567332 Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
Merged-In: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
2022-03-17 11:44:39 +00:00
Giulio Fiscella
8861c5d16c [automerge] Use new severity levels and builders 2p: 3612e9e440
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238283

Bug: 218817241
Bug: 220367542
Change-Id: I75a2c08dc05fcf6788d034c3981164cfe23a20d8
2022-03-17 11:34:56 +00:00
Giulio Fiscella
3612e9e440 Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
2022-03-17 11:34:42 +00:00
Oli Lan
0a930a6ae7 Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043

Change-Id: I6862bc73e008def7eeabca63681b7cfd2df72c41
2022-03-17 10:26:52 +00:00
Oli Lan
8b096f0400 Merge "Reduce gap above user list in multiuser settings." into tm-dev 2022-03-17 09:58:09 +00:00
Tsung-Mao Fang
a3e7f3dbac Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I07a98c4f687a5d3623a82edddbcf854b517cdeb7
2022-03-17 09:23:10 +00:00
Tsung-Mao Fang
469e484b37 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I64c0a288da45a3b2ef6fe3297e9b7c148a045d87
2022-03-17 09:20:50 +00:00
Tsung-Mao Fang
7052d53fd8 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I48bad553fd360ab51329e70a9857683014690743
2022-03-17 08:46:38 +00:00
Tsung-Mao Fang
19d06e79b9 Merge "Settings: only set phone number if it's not empty" 2022-03-17 07:35:42 +00:00
Daniel Huang
05a975c814 Merge "[Panlingual] Handle onLocaleSelected." 2022-03-17 07:15:49 +00:00
Bonian Chen
9a2fd713bf Merge "[DataUsage] Adjusting the control of display sequence" 2022-03-17 05:36:33 +00:00
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
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
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
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
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
804dc16a03 Merge "Remove support for converting from FDE to FBE" 2022-03-16 18:10:30 +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
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
Bonian Chen
b8491032d7 [DataUsage] Adjusting the control of display sequence
Showing a usage graph before end of statistic would lead to incorrect
height of usage graph, and another update would lead to layout moved a
little bit.

This change tries to improve it through:
1. Start the loading animation earlier, and stop animation when
   statistics loaded.
   (Only effective when UI re-create.)
2. Update the UI only when statistics are ready.

Bug: 187019210
Test: robotest ChartDataUsagePreferenceTest DataUsageListTest
Change-Id: Ic83f2422b6c6d55948110d652ee24234f43b6445
2022-03-16 20:29:53 +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
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
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
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
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