Commit Graph

49922 Commits

Author SHA1 Message Date
mxyyiyi
e9378d27f7 App anomaly tips on PowerUsage App list
Screenshots:
[in bg - banner] https://screenshot.googleplex.com/MzLC6LfX93TkkYf
[in bg - hints] https://screenshot.googleplex.com/9JLXNsRiVG8arAU
[in fg - banner] https://screenshot.googleplex.com/9oYbwUkeeLbQX2t
[in fg - hints] https://screenshot.googleplex.com/53DTTUCUnf8rsoE
[apps anomaly highlight hint + settings anomaly banner]
https://screenshot.googleplex.com/8NdS2VMrSzwv2DM

Bug: 291689643
Bug: 291689623
Bug: 284893240
Test: manual
Change-Id: Ic02db49cb3794ef134759d9dcec5f5ef32454a95
Merged-In: Ic02db49cb3794ef134759d9dcec5f5ef32454a95
Merged-In: I7015cdf5a96d518febb160934d780ae84fe14427
2023-09-18 18:28:20 +08:00
Alice Kuo
aa734eb52a Use system properties for the le audio toggle ui config instead
Config LE audio UI per devices. Change to use system properties instead

Bug: 300807171
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: Id0d624f516b9fdbe2380e5f10da5c69b08eea6a4
2023-09-18 03:05:59 +00:00
Guojing Yuan
e0cce7bf6a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24708184

Change-Id: I3c29e5b9a46695e5c21a837e00891cc22e0bff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:46 +00:00
Guojing Yuan
d43d6f259a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev 2023-09-15 21:15:00 +00:00
Bhavuk Jain
0c7ac1bdc6 Fixed a11y announcement while setting a PIN
This CL removes explicitly setting the disabled state of the confirm
button while reconfirming the PIN in the setting of PIN flow. We do this
since otherwise a11y services announces the state of the button which is
confusing for users.

Bug: b/281953347
Test: Tested by building and installing Settings APK on local device,
and checking a11y announcement. Also setup a PIN to see if the setup
flow is working properly.

Change-Id: I91b592310e240c3994049330c8a881740a3a0d59
2023-09-15 19:31:16 +00:00
Guojing Yuan
5f86e8ff03 [CDM] Add Permissions Sync toggle
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
Merged-In: I75d4370eed98275e2f99d65620229bdb57193fb8
2023-09-15 18:05:37 +00:00
Behnam Heydarshahi
a38edf1ab2 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev am: c46e8546b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24664970

Change-Id: I08ca157dc7fc5ac41697023265268603e737c044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:21:07 +00:00
Behnam Heydarshahi
c46e8546b5 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev 2023-09-15 16:52:10 +00:00
Treehugger Robot
713c4b3bf5 Merge "Use launcher namespace instead of settings-ui namespace." into udc-qpr-dev am: d78136fe29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24761915

Change-Id: I188286f9d70e4518d11bf1408718961da57dfcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 16:26:30 +00:00
Treehugger Robot
d78136fe29 Merge "Use launcher namespace instead of settings-ui namespace." into udc-qpr-dev 2023-09-15 15:15:00 +00:00
Behnam Heydarshahi
374b417b68 PanelSlicesAdapter: load slice label safely
Load the slice action label string safely when action label is set, and
no longer at adapter instantiation time.

Bug: b/298571448

Test: atest PanelSlicesAdapterTest
Change-Id: I0d5b6e0b2db2fa78d3f58ae2cb96f14437923ffd
2023-09-15 14:44:33 +00:00
Graciela Putri
285a139c6f Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev am: 263126b580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24757660

Change-Id: I07abbfb97702a0c96ee3f3a80d13fc167c4bf978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 09:14:58 +00:00
Graciela Putri
263126b580 Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev 2023-09-15 08:48:24 +00:00
Treehugger Robot
51749d4418 Merge "Refresh title in the Network details header" into udc-qpr-dev am: 6aaf49dc1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755454

Change-Id: Ic692b1ad20ae7a0ba31f2dbd6bfa3aa3cbb42024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 04:04:46 +00:00
Weng Su
fafdf08535 Refresh title in the Network details header
- Since the title information may be updated later, it needs to be refreshed continuously to display the latest results.

Bug: 299514568
Test: manual test
atest -c WifiDetailPreferenceController2Test

Merged-In: I4634c152b550c59bd9854cde1b91da44442aa879
Change-Id: I4634c152b550c59bd9854cde1b91da44442aa879
2023-09-15 02:52:38 +00:00
Holly Sun
9fa69928d5 Use launcher namespace instead of settings-ui namespace.
Bug: 294858168
Test: manual + unit
Change-Id: I5820ba86686584b7bc4a2ad695e5b5c0cf46b297
2023-09-14 23:06:58 +00:00
Graciela Putri
ae170b7970 Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev am: 7cf5bb509e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24742814

Change-Id: I1f559828d5ab7ce517b231df8bd0f7e92541b677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 22:32:52 +00:00
Graciela Putri
7cf5bb509e Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev 2023-09-14 21:25:52 +00:00
Graciela Wissen Putri
7889f55f3d Remove moreOptions in aspect ratio settings
System apps that are not visible in Home/Launcher are already excluded
by default.

Fix: 299924064
Test: Manual
Change-Id: Ia5972f23b1a9dd2f6dda65fb02784fe722e7a63a
2023-09-14 13:23:09 +00:00
Graciela Wissen Putri
392a811294 Add accessible sequence for aspect ratio options
Fix: 297293566
Test: Manual
Change-Id: I12b61ccd0330b80e027af7a9eb1693b8d94cc262
2023-09-14 10:35:05 +00:00
Anvesh Renikindi
7bed4aade8 Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future 2023-09-13 16:29:32 +00:00
Wentao Wang
0d3ae3ed32 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: I1c3d89346991f82f994a230db385ef2c523b067a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 13:01:39 +00:00
Wentao Wang
38f12abb75 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev 2023-09-13 11:51:21 +00:00
Wentao Wang
a44e75d6ed Separate the demo user factory reset option with admin user factory reset option.
A security vulnerability was discovered by Android security. b/292548775 Within a short period of time after the device reboot, the user could enter the settings page and factory reset the device. Android Enterprise suggests to add DISALLOW_FACTORY_RESET user restriction to the device.

However, DISALLOW_FACTORY_RESET will be enabled on all Android users, including both the admin user and the demo user. The existing behavior in Android settings is that once the user restriction is set, factory reset button will be greyed out, which makes the factory reset functionality in demo user go away.

In demo user, the factory reset command will be forwarded to the current active device owner. So in this change, we separate the button for admin user and the button for demo user.

In demo user, the button is still visible when the restriction is set.

And in admin user, the button will be greyed out as expected.

Once this change is in, then Pixel Retail Demo could set the user restriction properly and rely on its internal logic to do factory reset. If other applications are trying to do the factory reset, it will be denied by OS.

BUG: 292548775
Change-Id: I9d2d47bb29bc2c1e05058b246908768cd2f95990
2023-09-13 11:47:11 +00:00
Graciela Putri
f862ff58f0 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:58:10 +00:00
mxyyiyi
9e4fed1b62 Impl highlight effect on BatteryChartView slots. am: 6750634259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498956

Change-Id: Iff96ebb33e50b2c2bddbe44eada5bf35f7118531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:57:45 +00:00
Graciela Putri
dd34fa54e4 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev 2023-09-13 07:14:13 +00:00
mxyyiyi
6750634259 Impl highlight effect on BatteryChartView slots.
Screenshot: https://screenshot.googleplex.com/F5VrGjj5kdNHMV6

Bug: 284893240
Bug: 291689623
Test: manual
Change-Id: I846d95d31e8bb839481b86a94d5191ff205f8328
2023-09-13 13:29:32 +08:00
YK Hung
9feaa3d883 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a7101
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24545857

Change-Id: I29faff65657c84156d21d8e2bfc6ea285dbd5f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 04:45:21 +00:00
YK Hung
8596b78a00 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b5491447
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24663389

Change-Id: I89aa04fe2079243e78328177069bb16c1e8e5297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 04:43:40 +00:00
YK Hung
348b3b91d8 Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev am: 378ad24aac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24673967

Change-Id: I06b8e72ab87c673ffde51cfbc4a93327a770f4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 04:39:58 +00:00
Treehugger Robot
aab57c0179 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev am: 7e92664f52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24689853

Change-Id: I6aa86815837a7be5fc76273a121c4060a12f5b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 04:39:21 +00:00
YK Hung
9a293a7101 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev 2023-09-13 04:35:26 +00:00
YK Hung
02b5491447 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev 2023-09-13 04:35:16 +00:00
YK Hung
378ad24aac Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev 2023-09-13 04:24:04 +00:00
Treehugger Robot
7e92664f52 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev 2023-09-13 04:11:20 +00:00
Zaiyue Xue
ea0f5b3d45 Refactor battery usage page contollers interaction logic
(1) Move controllers interaction logic from BatteryChartPreferenceController to main page PowerUsageAdvanced.
(2) Move query power anomaly logic to DataProcessManager async job.

Bug: 284893240
Test: manual
Change-Id: Ib23b338fe3946e68ff73a372342ec5d86494c566
Merged-In: Ib23b338fe3946e68ff73a372342ec5d86494c566
2023-09-13 03:56:28 +00:00
Colin Cross
f87c5f2cfc Merge "Fix kotlin nullable errors in Settings" into aosp-main-future 2023-09-12 18:36:47 +00:00
Yuanru Qian
ea691aca93 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I1a0c3b36915a42588aafdeaa41eca6fd57889350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:43:15 +00:00
Yuanru Qian
22a947a156 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I0710a54b97a9b230c8802326687d76be7d7a51f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:04:28 +00:00
Graciela Wissen Putri
c37c8b8789 Change aspect ratio summary and footer text
Add more education for device user that setting aspect ratio has not
been tested by the app developer. Move Aspect ratio under Apps >
Advanced instead of General.

Fix: 296160724
Test: atest UserAspectRatioAppsPageProviderTest
Change-Id: I2078f285d7bfb8de3a61c69f9d0ff3872d683ed4
2023-09-12 16:56:10 +00:00
Yuanru Qian
945b20c70d Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: If6e8d7182b4c6feaca4da62052442f46f930b227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 16:14:39 +00:00
Chaohui Wang
5d8fea06b1 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)
(cherry picked from commit f1febf9e9b)
2023-09-12 15:30:57 +00:00
Yuanru Qian
81343f23fc Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I366f3dddb68df63b2ae251e71610c4d1e33ceefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 15:21:52 +00:00
mxyyiyi
19046965da Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)
- Remove unused flag is_battery_tips_feedback_enabled
- Update logic about is_battery_tips_enabled

Bug: 284893240
Bug: 291689623
Test: Manual
Change-Id: I826f517aa61e0c970048164706c4512ac3e0472d
Merged-In: I826f517aa61e0c970048164706c4512ac3e0472d
2023-09-12 11:28:10 +00:00
Massimo Carli
7d297719d7 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236

Change-Id: I8e95d9e9704649cbcb3eed980e3d0275116b4c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 11:16:24 +00:00
Massimo Carli
951bbde355 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev 2023-09-12 10:09:19 +00:00
Yuanru Qian
8ffc3c728d Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS
Change-Id: I29c44aec3a9065dd9e0c207faaea55da6ad21471
2023-09-12 07:39:43 +00:00
Massimo Carli
24aa9c8f15 Changed app string changes in user aspect ratio settings
Bug: 297288214
Test: Manual

Change-Id: I72c0b53d8d9db92b12d4e9507fcf40b1be76d745
2023-09-12 06:29:19 +00:00
Zaiyue Xue
13695adf07 Recheck the scedule job when the device is full charged and add more logs
Bug: 298539147
Fix: 298539147
Test: manual
Change-Id: Id9fdba17b24cbc6558bc29576f8cd93782854ee4
2023-09-12 13:44:19 +08:00