PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,578 Commits 1 Branch 0 Tags
f554e16f45ef9ca186f03be079b070bb269bd7f9
Commit Graph

141578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yiyi Shen
f86b438e3a Merge "[Audiosharing] Add audio sharing loggings (P4)" into main 2024-06-18 07:47:24 +00:00
Kai Zhou
5097783e6e Retrieve WifiDppQrGeneratorFragment at runtime. 
* Add getWifiDppQrCodeGeneratorFragment() in WifiFeatureProvider
* WifiDppConfiguratorActivity calls from the FeatureFactory to get WifiDppQrCodeGeneratorFragment instance
* Use a flag to guard this behaviour
* Updated a few private variables of WifiDppQrCodeGeneratorFragment to
  protected so I can access them in derived classes.

Bug: b/338891273
Settings Intake: b/329012096

Test: manual test, override the flag locally, and check I can switch to
overriden implementation.
Flag: com.android.settings.flags.enable_wifi_sharing_runtime_fragment

Change-Id: I715bf89bd9be221f06914e87629c76bf7a2f743f
 2024-06-18 07:28:10 +00:00
Chaohui Wang
e01855dcdb Fix SubscriptionInfoListViewModelTest 
Fix: 329160337
Test: unit test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:10f5bdabb468b806d634a2b9061b9908b2e8d430)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
 2024-06-18 06:59:56 +00:00
Chaohui Wang
80a81431f4 Use Kotlin List & NonNull String 
To avoid Room compiler error / warning.

Bug: 332487783
Test: m Settings
Flag: EXEMPT refactor
Change-Id: I79a4991c1a0009e347f0916f4f204229dc07581a
 2024-06-18 14:51:07 +08:00
Kevin Liu
c98478d21a [automerger skipped] Merge "Add strict_mode: false" into main am: 76d7864bc6 am: b7c686c6bf -s ours 
am skip reason: Merged-In I4381446dac381a34747043c564cf5288a2e16725 with SHA-1 4551e0693a is already in history

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

Change-Id: I4a324751769fc9524f96d7ad6c8053bad5934106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 06:13:31 +00:00
Xin Li
84b902e55b [automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main am: 87973cf893 -s ours am: beaed58a46 -s ours 
am skip reason: Merged-In If518bbb88342ae4c2e5e9f131727de58446be780 with SHA-1 cb7bd9dd74 is already in history

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

Change-Id: I373610dc53645c00b5c0c530f09766db98c48961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 05:57:16 +00:00
Xin Li
49f403e525 [automerger skipped] Merge Android 14 QPR3 to AOSP main am: ef55516656 -s ours am: 3c73c7f781 -s ours 
am skip reason: Merged-In If518bbb88342ae4c2e5e9f131727de58446be780 with SHA-1 cb7bd9dd74 is already in history

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

Change-Id: Ib5cb194a211d7767a0d73d0d24970498cc68e50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 05:55:22 +00:00
Hakjun Choi
254cf32ba7 Merge "Add a condition for preventing NPE when accessing SatelliteManager" into main 2024-06-18 04:01:46 +00:00
Kevin Liu
b7c686c6bf Merge "Add strict_mode: false" into main am: 76d7864bc6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073046

Change-Id: Idfbf43987ad07e7fd739ae68a7e50a6a11fc28c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 03:30:16 +00:00
Kevin Liu
76d7864bc6 Merge "Add strict_mode: false" into main 2024-06-18 03:07:47 +00:00
Treehugger Robot
861ae9c156 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-17 21:32:39 +00:00
Treehugger Robot
5d8cf40174 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-17 21:32:39 +00:00
Xin Li
beaed58a46 [automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main am: 87973cf893 -s ours 
am skip reason: Merged-In If518bbb88342ae4c2e5e9f131727de58446be780 with SHA-1 cb7bd9dd74 is already in history

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

Change-Id: I782840d8c263891e04fbd019a76e52c780ffb455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-17 20:43:48 +00:00
Xin Li
3c73c7f781 [automerger skipped] Merge Android 14 QPR3 to AOSP main am: ef55516656 -s ours 
am skip reason: Merged-In If518bbb88342ae4c2e5e9f131727de58446be780 with SHA-1 cb7bd9dd74 is already in history

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

Change-Id: Ia8395eb88bbfdf3f8de9bf8e9478bfd6c4f4c9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-17 20:41:49 +00:00
Treehugger Robot
0c8f3291d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f9a571ddef -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib5a80aef5c66330fdaf1f51876421d85eca8339b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-17 18:54:37 +00:00
Bill Yi
3e87e2430b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09044a6086 -s ours 
am skip reason: contains skip directive

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

Change-Id: Idae8d28b811af646b20efa04ab79e9c8bbd434c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-17 18:54:25 +00:00
Bill Yi
298161b12f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ae0a849dd -s ours 
am skip reason: contains skip directive

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

Change-Id: I649e36f030b4f014407651c923b38f9c323b57a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-17 18:54:13 +00:00
Bill Yi
162f6a2fbe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5eb10526dc -s ours 
am skip reason: contains skip directive

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

Change-Id: If8a6385cf1fb56a410a3ac221afc7aa30f399da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-17 18:51:58 +00:00
Xin Li
87973cf893 Merge "Merge Android 14 QPR3 to AOSP main" into main 2024-06-17 18:51:35 +00:00
Treehugger Robot
f9a571ddef Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-06-17 18:23:53 +00:00
Joshua McCloskey
40ec147d2b Opt out of predictive back for biometrics 
Test: Verified that the screens are skipped if they are finished in
activity#onCreate
Fixes: 338348564

Change-Id: I5ea7fb865c49108705af877edcd09f9739b1c7a5
 2024-06-17 17:48:03 +00:00
Matías Hernández
ee414b4c43 Extract the not-strictly-modes-related parts of ZenModesBackend 
So that when it's moved to SettingsLib, it doesn't need to carry that baggage.

Bug: 346519570
Test: atest com.android.settings.notification.modes
Flag: android.app.modes_ui
Change-Id: I7911a521d96f5dbac2c2395171d324b7b54b8b07
 2024-06-17 18:11:39 +02:00
Treehugger Robot
a3894e6761 Merge "Add new database table and proto for battery usage reattribution (2/5)" into main 2024-06-17 11:28:54 +00:00
Xinyi Mao
c0f7e758d1 Merge "Add flag to force expire the app optimization mode event." into main 2024-06-17 10:48:58 +00:00
Yiyi Shen
52cbe21569 [Audiosharing] Add audio sharing loggings (P4) 
Bug: 331515891
Test: atest
Change-Id: I05e1c138f9cc32c4e873852f93bac65d3d0dc3ca
 2024-06-17 18:46:11 +08:00
Chaohui Wang
c5fc20d851 Merge "Reduce api calls when getDataSummary" into main 2024-06-17 10:22:05 +00:00
Chaohui Wang
9e88efecdf Refactor PrintSettings (2/n) 
The "Add service" button.

Bug: 320076351
Flag: com.android.settings.flags.refactor_print_settings
Test: manual
Test: unit test
Change-Id: I624293edcbfe9ef8388d48759611aeac522352a4
 2024-06-17 18:13:37 +08:00
YK Hung
f5cf54bcc7 Add new database table and proto for battery usage reattribution (2/5) 
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: If360246d974abdea7004023aedcf1a4be7b63633
 2024-06-17 10:13:34 +00:00
mxyyiyi
08907935df Add flag to force expire the app optimization mode event. 
Bug: 347444433
Test: atest
Change-Id: Id502607ed6c07870d14346656a65ceccb756b78f
 2024-06-17 17:04:05 +08:00
Xinyi Mao
3576f4840d Merge "Migrate battery usage DAO to Kotlin" into main 2024-06-17 08:47:06 +00:00
Chaohui Wang
dc02b5ea59 Reduce api calls when getDataSummary 
When defaultSubId == activeSubId, return display name directly.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Change-Id: I8422c709483069a6894b99d5cc2cc652459ab5e0
 2024-06-17 15:43:07 +08:00
Bill Yi
5ae0a849dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2af64081866baacad501fa9bde60c46a6d15b65c
 2024-06-17 00:17:33 -07:00
Bill Yi
09044a6086 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibca62b8b3da79612823fb9012ba26203922a3e42
 2024-06-17 00:14:35 -07:00
Bill Yi
167de89267 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0823f35e3c15f7146f94e1d1c7565780b71b3c38
 2024-06-17 00:12:46 -07:00
Bill Yi
6f9a2c5cc3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e1f35008139570ec25edbe50ecac03d23095bfc
 2024-06-17 00:10:33 -07:00
Bill Yi
5eb10526dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80896e28e7043686f93756f82ed2c9beeac62df1
 2024-06-17 00:08:47 -07:00
Hakjun Choi
bdfd24ed5a Add a condition for preventing NPE when accessing SatelliteManager 
There could be a case that FEATURE_TELEPHONY_SATELLITE is false but KEY_SATELLITE_ATTACH_SUPPORTED_BOOL it true
Since SatelliteManager can be returned only when FEATURE_TELEPHONY_SATELLITE is enabled, added a condition checks whether SatelliteManager is null or not

Bug: 347057183
Test: atest SatelliteManagerTest SatelliteManagerTestOnMockServiceTest
      manually e2e test with FEATURE_TELEPHONY_SATELLITE disabled
Change-Id: I3f51e6805ccab3366d9d01be2e999818cd18354f
 2024-06-17 06:26:21 +00:00
SongFerng Wang
2f71bc764d Merge "Fix test case failed" into main 2024-06-17 05:30:06 +00:00
Chaohui Wang
b3f2e4d517 Migrate battery usage DAO to Kotlin 
To better support null type safety, and fix build
warnings.

Bug: 332487783
Test: m Settings
Change-Id: I00f3add356e3f825ab76aae4f81129eba348eca8
 2024-06-17 12:26:20 +08:00
Chaohui Wang
288b40ee4f Fix Apn network type tests 
Bug: 347114536
Test: unit test
Change-Id: Ib5bd331e9a28e89e426bf423e6086d1c2d288961
 2024-06-17 11:48:53 +08:00
Yiyi Shen
9bd19f4604 Merge "[Audiosharing] Reset shadows after tests." into main 2024-06-16 13:24:13 +00:00
Yiyi Shen
440d061648 Merge "[Audiosharing] Increase audio sharing test coverage" into main 2024-06-16 13:21:38 +00:00
Alexander Roederer
be647ab053 Merge changes from topic "b308819928-ModesSettingsAppBreakthroughPage" into main 
* changes:
  Modify Summary for Mode's Apps settings page
  Adds summary helper for apps subtitle
 2024-06-16 02:49:53 +00:00
Matías Hernández
68953d33c1 Merge "First bits of "add a mode"" into main 2024-06-15 12:14:09 +00:00
Alexander Roederer
41902bb0c5 Modify Summary for Mode's Apps settings page 
Adds call to SummaryHelper to set Apps preference summary.

Bug: 308819928
Test: atest ZenModeAppsLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: Iebec11afc62ecb79386e1866af57cd4e68461a95
 2024-06-15 04:48:38 +00:00
Treehugger Robot
bd1a726696 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-14 20:34:40 +00:00
Treehugger Robot
98a233697d Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-14 20:34:40 +00:00
Matías Hernández
8409c39d94 First bits of "add a mode" 
* Preference below the modes list.
* Temporarily triggers addition of a mode with default name and type=SCHEDULE_TIME (type will be "manual only" later).
* Fixed sorting of modes in the list when refreshing (new modes were added at the bottom instead of where they should, the same would've happened for renamed modes).
* Minor polishes (extracted fragment launch to helper class, renamed item controller class for clarity).

Test: atest com.android.settings.notification.modes
Bug: 326442408
Fixes: 347198709
Flag: android.app.modes_ui
Change-Id: Ie276c92181c5374faf74592433595e7e15a5efc0
 2024-06-14 15:23:30 +00:00
Julia Reynolds
54a357fc3a Remove unneeded AsyncTask 
Change-Id: I962a61c7a73f1d7a464ee76284f1d4175d04e62a
 2024-06-14 14:42:50 +00:00
Joseph Vincent
7652089fa4 Merge "Center align illustration is PS setup screen for tablet" into main 2024-06-14 14:11:08 +00:00