Commit Graph

141705 Commits

Author SHA1 Message Date
Treehugger Robot
2d94e186b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: d4fe5b213b -s ours
am skip reason: contains skip directive

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

Change-Id: Ifd9d1dce65439f2239c2c80f20ebd10b9079b738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 21:35:55 +00:00
Bill Yi
b119b4867c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0117f0587d -s ours
am skip reason: contains skip directive

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

Change-Id: Ia0c397017a6b648c4174e4f380db51482b8345c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 21:35:42 +00:00
Treehugger Robot
d4fe5b213b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-06-26 21:17:07 +00:00
Bill Yi
5d6decda38 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-26 21:05:30 +00:00
Bill Yi
35af1e3df6 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-26 21:05:30 +00:00
Bill Yi
1174976e22 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-26 21:05:30 +00:00
David Anderson
d3e4daaa7c Merge "Allow overriding DeviceDiagnosticsPreferenceController." into main 2024-06-26 21:02:52 +00:00
Priyanka Advani
e200279002 Merge "Revert "Fix "Dock defend string and tips in settings are incorrectly" issue"" into main 2024-06-26 20:42:45 +00:00
Treehugger Robot
943a43d16b Merge "Removed redundant dependcy from build file" into main 2024-06-26 19:51:06 +00:00
Treehugger Robot
15d8b29ddb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a1129fdc72 -s ours
am skip reason: contains skip directive

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

Change-Id: I011c594be6e45652502ea5e2f2fc3fda7f8091fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 19:44:58 +00:00
Bill Yi
e774cac38f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1928d2b29 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic7432ea0252e97a2ac4d4a5b2c4082e484dc12e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 19:44:54 +00:00
Treehugger Robot
fcc4c945eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 62604c15c7 -s ours
am skip reason: contains skip directive

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

Change-Id: I566a07460dbd7675e5100faf22eafb28869702ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 19:44:50 +00:00
Bill Yi
a15ac0cfc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b31680efe -s ours
am skip reason: contains skip directive

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

Change-Id: I24ae7e96e6c4d1b73636297ea42bdde86b20b9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 19:44:44 +00:00
Bill Yi
77a56d31cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e908765fab -s ours
am skip reason: contains skip directive

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

Change-Id: I757d2cfd2377e8a42bd5a2bc56254e0c439af665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 19:44:25 +00:00
Bill Yi
5653acd533 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80e4c070b -s ours
am skip reason: contains skip directive

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

Change-Id: I4fb02558f2849d8de99333e0ed81ea545430d1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 19:29:43 +00:00
Treehugger Robot
a1129fdc72 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-06-26 19:21:17 +00:00
Treehugger Robot
62604c15c7 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-06-26 19:21:17 +00:00
Joshua McCloskey
d5321719fe Removed redundant dependcy from build file
Test: Verified that the additional libraries don't cause any issue with
settings
Bug: 346161718
Flag: BUILD ONLY

Change-Id: Ie3d266c486d507c241d800fa7f2680a595896280
2024-06-26 18:57:04 +00:00
SongFerng Wang
ac7236ec0f Merge "Add more condition to avoid to open the SimOnboardingActivity" into main 2024-06-26 17:15:20 +00:00
Jason Chang
798ad3dd24 Merge "Revise the order in the strings to make "Face" in front of "Fingerprint" except for "Choose a screen lock" screen" into main 2024-06-26 17:09:49 +00:00
Chaitanya Cheemala
4cfc0d8156 Revert "Fix "Dock defend string and tips in settings are incorrectly" issue"
This reverts commit d1114107df.

Reason for revert: Likely culprit for b/349578829  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I905a439c73e120efa094f097d59f68d0bedb0648
2024-06-26 15:47:11 +00:00
Julia Reynolds
aec909bd44 Merge "Move 'show hidden channels' option" into main 2024-06-26 13:30:48 +00:00
Treehugger Robot
49fc26ceb3 Merge "Guard against exception when reg/unreg content observer" into main 2024-06-26 13:06:06 +00:00
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
songferngwang
f554e16f45 Add more condition to avoid to open the SimOnboardingActivity
when the user inserts the psim, showing the sim onboarding for the user to setup the sim switching or the default data subscription in DSDS.
Will show dialog for below cases.
1. the psim slot is not active.
2. there are one or more active sim.

Bug: 348524643
Test: verify the UI
Flag: EXEMPT bugfix
Change-Id: I3c782fa2486fde25ac15a69b48ba2f07f90572bd
2024-06-26 10:48:32 +00:00
Yiyi Shen
6e6df5d6e2 [Audiosharing] Fix IllegalStateException at getChildFragmentManager
Fix: 349300412
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I33a22ce12ae4c602be9aafdbd9cf9fdcee82bdde
2024-06-26 18:17:46 +08: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
Jason Chiu
361020dfdc Allow the background activity start from legacy suggestion cards
There's a restriction on starting activities from PendingIntents. Opt-in
required when starting activities from PendingIntents. (https://goo.gle/android-bal#opt-in-required)

Bug: 346690654
Change-Id: I0525ebe5a49e7a7f5b07236e01cd3ababce1da4d
Test: manual
2024-06-26 08:54:21 +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
Jason Chiu
f22b2668e0 Guard against exception when reg/unreg content observer
When an app injects an entry to Settings with dynamic title/summary, and
disables its content provider at runtime, Settings will crash while
trying to registering/unregistering the data observer.

Fix: 337567627
Test: manual
Flag: EXEMPT bugfix
Change-Id: I9c7f689c6696d91f0b8e40113a8df10375930ede
2024-06-26 16:06:31 +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
Jason Chang
7acebd1b97 Revise the order in the strings to make "Face" in front of
"Fingerprint" except for "Choose a screen lock" screen

Change the string order to fulfill the UX requirement.

Flag: EXEMPT bugfix

Bug: 293396928

Test: Build ABTD ROM and check the string order.
Change-Id: I4725e22e16ea20ea774383d0c67038479805e6fa
2024-06-26 06:41:05 +00: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
Chaohui Wang
af56a3ea21 Not use SubscriptionInfoEntity in DataUsageList
Carrier id will be get in DataUsageListAppsController async.

Bug: 348118234
Flag: EXEMPT clean up
Test: manual - on DataUsageList
Change-Id: I06b361f38d04c5020431cd8c6e359aa3a69942e5
2024-06-26 11:58:07 +08: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
Bill Yi
a1928d2b29 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I18b9044d42d545dee44a5133bc7f634cd7233788
2024-06-25 15:29:44 -07:00
Bill Yi
4ab8a91ca7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I209fe6c1709896300c8628c85eb8eae8bca13c7e
2024-06-25 15:28:53 -07:00