Commit Graph

141614 Commits

Author SHA1 Message Date
Matías Hernández
3df9e97f77 Merge "Changes to icon picker for reusability in "add mode" flow" into main 2024-06-26 11:40:21 +00:00
YK Hung
38f3171f56 Merge "Fix "Dock defend string and tips in settings are incorrectly" issue" into main 2024-06-26 11:11:11 +00:00
YK Hung
59f9bd0630 Merge "Fetch package uid under the corresponding user handle." into main 2024-06-26 11:10:40 +00:00
Matías Hernández
c2d2de085d Changes to icon picker for reusability in "add mode" flow
* Don't finish the fragment from the controller (ugh!) instead just report the selected icon via a listener.
* Highlight the selected icon in the list.
* Cache the icon drawables (since we're using selectors for the colors, we don't need to swap them, one per icon resource id is enough).
* Improved the tests a bit too.

Bug: 333901673
Bug: 326442408
Test: ates
Flag: android.app.modes_ui
Change-Id: Ib2ec7a7e3ed99b13f9264aa6f7c209ee3f6967a0
2024-06-26 11:38:56 +02:00
Xinyi Mao
ede7f73f20 Merge "Skip load app name from PackageManager while init the BatteryEntry." into main 2024-06-26 09:05:09 +00:00
mxyyiyi
7ff146a34a Fetch package uid under the corresponding user handle.
- Make 3p-app usage entry under work profile selectable:
[Before] https://screenshot.googleplex.com/AuD3Q8hrepmxaoS
[After]  https://screenshot.googleplex.com/ACrXLcV2RYYv9aA

Bug: 346982931
Fix: 346982931
Test: atest BatteryDiffEntryTest
Flag: EXEMPT bug fix
Change-Id: Ib54df4c6d343dd32057e741b448596357ec2c12f
2024-06-26 17:03:29 +08:00
Chaohui Wang
a0badd0456 Merge changes I51395a55,I63a86569 into main
* changes:
  Fix unable to erase eSIM
  SubscriptionRepository.activeSubscriptionIdListFlow
2024-06-26 08:59:07 +00:00
pajacechen
d1114107df Fix "Dock defend string and tips in settings are incorrectly" issue
Symptom: After the dock defend was triggered, the battery tips still
show "Future-Bypass" dock defend mode. It should be the "Active" dock
defend mode.

Root Cause: The original `BatteryInfo.isBatteryDefender` was implemented
by using `longlife`, due to the charging limit also reuse `longlife`
issue, we replace the implementation of `BatteryInfo.isBatteryDefender`
with HAL API call `isTempDefend` and `isDwellDefend`. However, the
dock defend also needs `longlife`, the original
`BatteryInfo.isBatteryDefender`. So the dock defend checking failed
after replacing the implementation of `BatteryInfo.isBatteryDefender`

Solution: Add new property isLonglife in BatteryInfo

Bug: 348563863
Test: Manual Test and robotest
Test: http://ab/I55100010289930405
Flag: EXEMPT bugfix
Change-Id: I180cde7a193d75243893471634bab5f354c1623b
2024-06-26 16:38:14 +08:00
YK Hung
ad1fa9b0b5 Merge "Reattribute data into other apps as the final result (4/5)" into main 2024-06-26 07:54:06 +00:00
mxyyiyi
13988cec01 Skip load app name from PackageManager while init the BatteryEntry.
- getApplicationLabel is time-consuming.
[Before]
https://pprof.corp.google.com/?id=bade2601da25f6169b0685a3e2a3e5cc
https://screenshot.googleplex.com/86R5DhMgcyQakys
[After]
https://pprof.corp.google.com/?id=2ccb1e88222e96db1fbcc072470a254c
https://screenshot.googleplex.com/7QviDFSpgzoQcg6

Bug: 349120408
Fix: 349120408
Test: atest + pprof
Flag: EXEMPT bug fix
Change-Id: I1eed60cea9c5bd3f77f38993f7d04906aa811da5
2024-06-26 15:49:30 +08:00
Yiyi Shen
832c751e29 Merge "[Audiosharing] Avoid start sharing dialog for single device." into main 2024-06-26 06:29:07 +00:00
YK Hung
bc93a6a146 Reattribute data into other apps as the final result (4/5)
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: I8b8a988df2718b64cd752915205db687ffe9d559
2024-06-26 06:25:15 +00:00
Treehugger Robot
c9cbbe7bd5 Merge "Avoid to change preference UI content from tapping outside of dialog." into main 2024-06-26 03:55:09 +00:00
Roy Chou
b0220d8878 Merge "chore(brightness suw): adjust auto brightness detail page footer content description" into main 2024-06-26 03:51:47 +00:00
Chaohui Wang
b70c805717 Fix unable to erase eSIM
Before this change,
- eSIM will be erased twice, one with result callback and one without
  result callback.
- During reset, ResetNetworkConfirm could interrupted by subscription
  invalid event, which happens during reset.

After this change,
- eSIM will be erased only once, result callback is registered
  separately.
- Explicit exit the page when reset finish, and ignore the subscription
  invalid event after reset started.

Bug: 328293508
Flag: EXEMPT bug fix
Test: manual - dry run the reset
Test: ResetNetworkConfirmTest
Change-Id: I51395a556b1c8775192d5897a87f13046c042578
2024-06-26 11:02:56 +08:00
Chaohui Wang
edc72a9b0f SubscriptionRepository.activeSubscriptionIdListFlow
Bug: 328293508
Flag: EXEMPT refactor
Test: manual - on Mobile Settings
Test: unit test
Change-Id: I63a86569f4fa3a27bd38d9853f6141890d26b881
2024-06-26 10:55:59 +08:00
Angela Wang
69f686828b Merge changes from topic "ha-preset-unavailable" into main
* changes:
  Remove unavailable preset info option
  Show message when no preset info is obtained from the remote device
2024-06-26 02:48:19 +00:00
tomhsu
75509bd06b Avoid to change preference UI content from tapping outside of dialog.
Flag: EXEMPT bug fix
Fix: 335763360
Test: atest passed.
Test: Manual test passed.
Change-Id: Iec5e98f74f0009ab2d3bc21bc590229514192f93
2024-06-26 02:38:25 +00:00
Joshua Mccloskey
2d0638c76b Merge "Revert "Restart fingerprint auth on cancel."" into main 2024-06-26 00:09:29 +00:00
Joshua Mccloskey
16f973b836 Revert "Restart fingerprint auth on cancel."
This reverts commit 4efd4c16f9.

Reason for revert: Breaks auth behavior

Fixes: 347858844

Change-Id: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f
2024-06-25 21:35:00 +00:00
Treehugger Robot
40b6a49287 Merge "Adjust strings in modes list to match latest mocks" into main 2024-06-25 16:07:07 +00:00
Haijie Hong
9bf762bfdd Merge "Add device to to cached device manager if it's not present" into main 2024-06-25 16:06:55 +00:00
Treehugger Robot
9616a8ea11 Merge "Add @RequiresPermission to ACTION_PREPARE_FACTORY_RESET" into main 2024-06-25 15:11:33 +00:00
Oleg Blinnikov
b3926bdf35 Merge "Added External Display settings page" into main 2024-06-25 15:01:01 +00:00
Matías Hernández
7fb0c3308e Adjust strings in modes list to match latest mocks
Bug: 346575288
Test: atest ZenModesListItemPreferenceTest
Flag: android.app.modes_ui
Change-Id: Ibe9c049ed0fb3b1838866b923a6227d67885c75c
2024-06-25 16:48:31 +02:00
Pat Manning
d303afbbd7 Add Settings for vector-specific PointerIcon scale.
Bug: 305193969
Test: PointerScaleSeekBarControllerTest
Flag: com.android.systemui.enable_vector_cursor_a11y_settings
Change-Id: I2f344f1d5fc6d5c8eb7159570287b8ce6f9ac070
2024-06-25 13:55:59 +00:00
Oleg Blinnikov
a6016e6552 Added External Display settings page
Settings page to show rotation, resolution,
enable/disable display settings for
external and overlay displays. In case
persist.demo.userrotation.package_name
sysprop is set, then the virtual
display with this will also be shown.

In case there is only one allowed display
available, then this display will be
shown right away. When there are more
than 1 displays available, then the list
of displays will be shown.

Change-Id: I186667aaba94ed6befec3a98f4a87f2b2d1f1859
Test: atest ExternalDisplayUpdaterTest
Test: atest ExternalDisplayPreferenceFragmentTest
Test: atest ResolutionPreferenceFragmentTest
Test: atest ConnectedDeviceGroupControllerTest
Bug: 340218151
Bug: 294015706
Bug: 253296253
Flag: com.android.settings.flags.rotation_connected_display_setting
Flag: com.android.settings.flags.resolution_and_enable_connected_display_setting
2024-06-25 13:41:10 +00:00
Tetiana Meronyk
ca90cf1fbe Merge changes Ie07816b7,I1b5aeeee,Id9d50703 into main
* changes:
  Show disabled add actions in COPE mode
  Add handling of admin enforced restrictions in Users Settings
  Refactor multiuser toggle to control user switch feature
2024-06-25 12:49:25 +00:00
Haijie Hong
a074f27499 Add device to to cached device manager if it's not present
Bug: 346923808
Test: atest BluetoothDeviceDetailsFragmentTest
Flag: EXEMPT minor bug fix
Change-Id: Ia4987bc7ec93cb6b54d188922b7232d83d528f2f
2024-06-25 10:42:38 +00:00
Yiyi Shen
f9424c6231 [Audiosharing] Avoid start sharing dialog for single device.
Issue - for LEA device with two BT addresses, when the second bud connected with
incorrect group id, we wrongly show up the start audio sharing dialog.

Fix - check there are two connected LEA valid groups before show up
start audio sharing dialog.

Bug: 347655885
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: Icd86ce2cfa4312c10c14906f46df324357c56990
2024-06-25 18:11:02 +08:00
Chaohui Wang
67d977b72e Merge "Clean up MobileNetworkRepository.DataRoamingObserver" into main 2024-06-25 09:37:01 +00:00
Angela Wang
2b78c17e84 Remove unavailable preset info option
Bug: 347134589
Test: atest BluetoothDetailsHearingAidsPresetsControllerTest
Flag: EXEMPT bugfix
Change-Id: Iabdbe675a08fcd172617ef31dd0b8fbe8dccbb89
2024-06-25 09:36:52 +00:00
Chelsea Hao
06feb6d1f7 Merge "[Audiosharing] Test getInstance for states" into main 2024-06-25 07:52:35 +00:00
Chaohui Wang
3e393d0a46 Merge "Fix Talkback can focus on blank area" into main 2024-06-25 06:51:12 +00:00
chelseahao
954d027917 [Audiosharing] Test getInstance for states
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostream
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: Ic0f143b427966dfa039fca3bd0028e0c6f7382ab
2024-06-25 14:29:19 +08:00
Chaohui Wang
b183f3732c [automerger skipped] Fix Apn network type tests am: ad93026e3b -s ours
am skip reason: Merged-In Ib5bd331e9a28e89e426bf423e6086d1c2d288961 with SHA-1 288b40ee4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27919224

Change-Id: I80399aa2093afcc9705d859247d2a82a836b1790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 05:41:56 +00:00
Treehugger Robot
7ee88983f5 Merge "When received Carrier Config Change, refresh UI." into main 2024-06-25 05:31:31 +00:00
Chaohui Wang
a23c53c9a9 Fix Talkback can focus on blank area
By hiding radio button frame instead of just radio button.

Fix: 347185801
Flag: EXEMPT bug fix
Test: manual - on ApnSettings
Change-Id: I7a2ba536f037a6cd014989bba1374d034169d90b
2024-06-25 13:26:12 +08:00
Chaohui Wang
b132ed91b1 Clean up MobileNetworkRepository.DataRoamingObserver
Bug: 348118234
Flag: EXEMPT clean up
Test: manual - on Mobile Settings
Change-Id: If9e7ed7cde0d7864ff00d135339a7725de179f1b
2024-06-25 12:12:41 +08:00
Treehugger Robot
aba2d057d6 Merge "Enable 16kb tests on general-tests suite" into main 2024-06-25 03:22:03 +00:00
Julien Desprez
e4087bf29f Enable 16kb tests on general-tests suite
This doesn't need to be built on device side.

Flag: TEST_ONLY
Test: https://android-build.corp.google.com/builds/abtd/run/L50300030004790194
Bug: 342232954

Change-Id: I86493e8d197ca6acc24743e44b63a764bf4d36df
2024-06-25 02:56:04 +00:00
Tetiana Meronyk
25e1b4d88b Show disabled add actions in COPE mode
Before this change these actions were hidden.

After this change, they are displayed but disabled which makes it more intuitive.

Bug: 336762423
Test: atest UserSettingsTest && atest UserDetailsSettingsTest
Flag: android.multiuser.new_multiuser_settings_ux
Change-Id: Ie07816b7d3817d12e78e1ec2692fcddea9328933
2024-06-24 21:28:57 +00:00
Automerger Merge Worker
ffcb87daee [automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2 -s ours am: ad31e0b966 -s ours am: a9feb359fb -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529

Change-Id: I39ede79391c58c90cc34f31d41043b4b5105506b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:52 +00:00
Chris Antol
2a8cac1d9d [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 694378b3da -s ours am: 0e02726c4e -s ours am: 68c24becb6 -s ours am: a2532a531a -s ours am: a5ca471ced -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529

Change-Id: I0f67071e988b7b20c8124ae24e6bafe99d0359d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:46 +00:00
Chris Antol
03d2ef33cf [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 4b9488fe71 -s ours am: 40cd7fb097 -s ours am: 664b99002b -s ours am: 095f81b067 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529

Change-Id: I58fcfbfec8df2e48183e20cd90244534413544d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:32 +00:00
Chris Antol
a013a93bb9 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours am: 26e556ab9e -s ours am: 2f7c96eb1b -s ours am: 7f52694f16 -s ours am: f6952b2253 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529

Change-Id: I5294101aae7d980880133b44aa4db623b6a8c71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:27 +00:00
Automerger Merge Worker
12c6fb720d [automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6 -s ours am: 94e3511650 -s ours am: 2c67b3834c -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747

Change-Id: Id8674cc2754226b454a76874af540a55f0341820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:13 +00:00
Chris Antol
7283591b8f [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 59b6740a52 -s ours am: 6fce978ab9 -s ours am: 62a2fae07c -s ours am: 9e499d615c -s ours am: 06a2d06948 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747

Change-Id: Ie789ea5a6a80d43ddbdf479d02f62afa464c0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:07 +00:00
Chris Antol
598324b80f [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 9bf862fefb -s ours am: 7a00bca567 -s ours am: 0dabe1aef2 -s ours am: 32e3f4c000 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747

Change-Id: I068db50439677349af3011e71d51d2a6725edf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:51 +00:00
Chris Antol
7463161926 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours am: 744e414e26 -s ours am: 454b89c0fe -s ours am: bb5472786a -s ours am: 49fe4c4c72 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747

Change-Id: If19842134e9d8961047665c828efee6d7d911667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:46 +00:00