Commit Graph

49922 Commits

Author SHA1 Message Date
Colin Cross
ee87a406cd Fix kotlin nullable errors in Settings
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:753c96133a1aa9e7b6dd63fa36816d171fec0f22)
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-09-11 22:30:58 +00:00
Massimo Carli
de41256dd2 Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735decd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24604368

Change-Id: If09e05a6f965cef5432feca8b06043e45117dda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 22:53:54 +00:00
Massimo Carli
f2735decd6 Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev 2023-09-08 21:52:03 +00:00
Holly Jiuyu Sun
04960fa7c3 Merge "Change feature flag to device config flag." into udc-qpr-dev am: 54f96175a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24606922

Change-Id: I59758624d230915a39fa2d8055831dd18e75f957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 16:22:18 +00:00
Jason Chang
99882cb3bb Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: f6fdfb0ddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24499558

Change-Id: I1d419997bcf7fe283f77532e942af04cd39a6161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 15:43:18 +00:00
Zaiyue Xue
a93fd54d09 Save foreground_service and cached consumed power in battery usage slot datebase.
Bug: 284893240
Test: manual
Change-Id: Ic09efabb0d93fb4bc7400b9410f32ec2f438dc73
2023-09-08 20:20:36 +08:00
Holly Jiuyu Sun
54f96175a2 Merge "Change feature flag to device config flag." into udc-qpr-dev 2023-09-07 18:47:54 +00:00
Colin Cross
8f7a1e6f53 Fix kotlin nullable errors in Settings
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
(cherry picked from commit 84f8961e67)
2023-09-07 17:11:11 +00:00
Jason Chang
f6fdfb0ddc Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev 2023-09-07 06:20:21 +00:00
Shivangi Dubey
00a78fca41 Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953

Change-Id: Iaf6c0514a406267de5924672b1e879a4dce3ce4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 15:06:39 +00:00
Shivangi Dubey
26e14e09bf Merge "Refine fold setting" into udc-qpr-dev 2023-09-06 14:28:54 +00:00
dshivangi
7435bbc70a Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
Merged-In: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
2023-09-06 10:52:12 +00:00
Graciela Putri
c8bd304d95 Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b419
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24620828

Change-Id: I336e6a719d50ab5bdc841d7e9bb68c6f60e040f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 03:19:38 +00:00
Graciela Putri
f7a443b419 Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev 2023-09-06 02:22:01 +00:00
Xin Li
770a4e1f11 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:35:36 +00:00
SongFerng Wang
33b6032bb2 Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev am: 60afc1259f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24575008

Change-Id: I2214f91f8f27ab937b2d9b96f62a1fdcdae47072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 02:49:28 +00:00
SongFerng Wang
60afc1259f Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev 2023-09-05 01:55:45 +00:00
Treehugger Robot
e4d9d80f15 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9 am: c9e0efd5ba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Ib944ab2e79ea349791e83a2dc7639920ac76245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 15:38:17 +00:00
Treehugger Robot
c9e0efd5ba Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: I6861bf65677a4d451b53b81993d262230739e482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 15:00:12 +00:00
Treehugger Robot
ed9bbf31c9 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Ia9c6634870b4c1591804153d9da63b6c13e1cf80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 14:10:40 +00:00
Treehugger Robot
9c21429af4 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Idca058c3f3d2de4324d51c9bfd0225cd44c2dbf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 13:15:08 +00:00
Jin Dong
a1ae2b1e93 Limit bluetooth broadcast password to single byte characters
The bluetooth broadcast password is supposed to be single byte
characters, so crash hanppened when input too many double-byte
characters when connecting to other broadcast.
Limit the password to single byte characters to fix this issue.

Bug: 297840479
Test: Manual
Change-Id: Ifab89ee9a07f20d1f30aba17bed694b5a5da8480
2023-09-04 08:14:10 +00:00
Holly Sun
584876ff09 Change feature flag to device config flag.
Bug: 294858168
Test: manual
Change-Id: I7411c0ef0272b1caf8a775be7216436e9e0f28a7
2023-09-01 17:24:14 +00:00
Holly Jiuyu Sun
b64f278e48 Merge "Add feature flag as a device_config flag for LPH to search." into udc-qpr-dev am: a5027a20ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24544150

Change-Id: I96427f5c65e502207e384b2eb9edf9649b32f885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 16:30:10 +00:00
Holly Jiuyu Sun
a5027a20ff Merge "Add feature flag as a device_config flag for LPH to search." into udc-qpr-dev 2023-09-01 15:32:40 +00:00
Xinyi Mao
428b124bea Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174

Change-Id: I7068d880ab644f01dba523132dbccd2cc6ceff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 08:59:18 +00:00
Xinyi Mao
c51a3da148 Merge "Impl app anomlay preference" into udc-qpr-dev 2023-09-01 07:53:09 +00:00
mxyyiyi
c4fb17d740 Impl app anomlay preference
[ScreenShot]: https://screenshot.googleplex.com/BBrHTQbwbFHxZE9

Bug: 291689623
Bug: 291689643
Test: manual
Change-Id: Ia257f3ace4a2d71b2221f861be3e1238de6d791e
2023-09-01 06:40:36 +00:00
Aleksandr Lukin
7888dfd518 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I92f3ad3e76029f5f0f2caff4e5016a2475decaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 02:27:28 +00:00
Vlad Popa
4ee43c40e9 Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690

Change-Id: I134714c9a5cb03c06d6dbee2256d7630554c37c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 00:44:41 +00:00
Vlad Popa
4010b222f8 Merge "Disable the spatializer options for device categories" into udc-qpr-dev 2023-09-01 00:33:47 +00:00
Xin Li
f8a0c0323f Merge UP1A.230905.019
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Change-Id: I2a988e3da0958f31323f95588e1ac66482186ecf
2023-08-31 12:31:10 -07:00
Vlad Popa
5175cdc2f5 Disable the spatializer options for device categories
If the BT device cannot be of category headphones do not show the
spatializer options.

Test: manual & atest BluetoothDetailsSpatialAudioControllerTest
Bug: 297265575
Merged-In: I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e
Change-Id: I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e
2023-08-31 09:48:49 -07:00
Massimo Carli
70ca63e4a2 Enable User Aspect Ratio Settings by default
Fix: 298203770
Test: Manual

Change-Id: I55daa03ab4369fef62ba439f4cf8af211f136021
2023-08-31 16:46:39 +00:00
Behnam Heydarshahi
e16000bbae Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev am: a5b314b90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24005152

Change-Id: I6cd38f69c8ddaaa02119a12ffb6f1f26ec34e5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 14:38:13 +00:00
Behnam Heydarshahi
a5b314b90f Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev 2023-08-31 13:40:55 +00:00
Massimo Carli
21f0f870f5 Remove version text in user aspect ratio settings page
Fix: 297153670
Test: Manual following instructions in the bug description

Change-Id: Iaf757715e60ab4ff2356ee0c89bc2129948a6c08
Merged-In: Iaf757715e60ab4ff2356ee0c89bc2129948a6c08
2023-08-31 09:28:22 +00:00
Edgar Wang
4bd401adf4 Update the API usage to get total size of devices
StorageStatsManager fixed in StorageStatsService#getTotalBytes
So that we should change back to call the API.

Bug: 295358118
Bug: 288103116
Test: verified manually
Change-Id: I3dcc9698403612f961cf0de41925dcbcb43e260b
(cherry picked from commit 2d57d002ae)
2023-08-30 13:28:46 +00:00
SongFerng Wang
8007efdbff Skip Data usage in Settings Widgets
- Do not show data usage in Settings Widgets if the device does not support sim or there is the User Restricted of mobileMobileNetwork.

Bug: 292998280
Test: Manual test
[pass]make RunSettingsRoboTests ROBOTEST_FILTER=CreateShortcutPreferenceControllerTest

Change-Id: I3984a43dc67e9efa92d06a4644b18d1799d56824
2023-08-30 17:48:53 +08:00
Holly Sun
9f7a1deed4 Add feature flag as a device_config flag for LPH to search.
Bug: 294858168
Test: manual + unit
Flag: settings_long_press_home_button_to_search
Change-Id: Ib18b672338d9976284d7fdb06590e4239de9ee9c
2023-08-29 23:29:00 +00:00
Anvesh Renikindi
cbb1f9d6a2 Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp am: 89310a6e76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423378

Change-Id: I49c729e23e6363bd4191217dd4d46c3a55a36bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 18:35:40 +00:00
Weng Su
09f9de899f Show Hotspot informations in Network details settings am: 36ae9189b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24573848

Change-Id: Icc16b788667e9938df601b504c98a6baca5962ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 18:20:46 +00:00
Chaohui Wang
f1febf9e9b Remove ExperimentalLifecycleComposeApi
Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
(cherry picked from commit 8d220f0641)
(cherry picked from commit 2910d68343)
2023-08-29 17:25:34 +00:00
Treehugger Robot
10d3e1e065 Merge "Enable i18n for battery tips card and fix b/297036263." into udc-qpr-dev-plus-aosp 2023-08-29 06:26:39 +00:00
SongFerng Wang
69ea8a2adc Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev am: 32c75f49a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24548405

Change-Id: I039187faf0a705b68509a241781f59f1e4c8c4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 04:59:49 +00:00
Weng Su
36ae9189b2 Show Hotspot informations in Network details settings
- Show Hotspot device type in hearder icon

- Show Hotspot device details informations.
  - Internet source (network type)
  - Battery

Bug: 297346368
Test: manual test
atest -c WifiNetworkDetailsFragmentTest \
         WifiDetailPreferenceController2Test
atest -c SharedConnectivityRepositoryTest \
         WifiNetworkDetailsViewModelTest

Merged-In: I4bd090e00681911c8fac469289fd818237b8c518
Change-Id: I4bd090e00681911c8fac469289fd818237b8c518
2023-08-29 03:56:11 +00:00
SongFerng Wang
32c75f49a7 Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev 2023-08-29 03:53:48 +00:00
Zaiyue Xue
ab00ac091d Enable i18n for battery tips card and fix b/297036263.
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
Merged-In: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
(cherry picked from commit d3156cc001)
2023-08-29 03:38:35 +00:00
SongFerngWang
7f62ae77dc Fix ClassCastException at NetworkSelectSettings
Bug: 296172317
Test: atest NetworkSelectSettingsTest
Change-Id: I811ef95f679bb1b0235a335320654c2acd68110c
2023-08-28 19:17:10 +08:00
Xin Li
6b3d512b63 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Change-Id: I4ed5b2e4c6c59527bb544e8b6dff2b9d4cee9025
2023-08-25 13:50:56 -07:00