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

141187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Zhou
a6c54bc98f Merge "Retrieve WifiDppQrGeneratorFragment at runtime." into main 2024-06-19 06:56:42 +00:00
Chaohui Wang
107f7a7a83 Merge "Refactor PrintSettings (2/n)" into main 2024-06-19 06:27:48 +00:00
Chaohui Wang
03ccaf8b9d Merge "Refactor ApnEditCarrierEnabled" into main 2024-06-19 05:21:24 +00:00
Chelsea Hao
e626a77a81 Merge "[Audiosharing] Add log for debugging." into main 2024-06-19 02:42:55 +00:00
chelseahao
89df32b48c [Audiosharing] Add log for debugging. 
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 347605485
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Change-Id: I319747652837c08ffcbbd5980609a0f8f35e3c24
 2024-06-19 02:42:37 +00:00
YK Hung
bf38bed803 Merge "Dump the BatteryReattribute from the database into bugreport (2/5)" into main 2024-06-19 02:29:31 +00:00
Chaohui Wang
71331802ef Refactor ApnEditCarrierEnabled 
Also fix tests.

Bug: 342374681
Flag: EXEMPT refactor
Test: manual - on Apn Edit
Test: unit test
Change-Id: I6db7f27a26341084940be4f8039f5097faa07ec8
 2024-06-19 02:19:29 +00:00
YK Hung
d226a97617 Dump the BatteryReattribute from the database into bugreport (2/5) 
Example:

    BatteryReattributeEntity{
    	Jun 18, 2024, 16:22:51
    	Jun 18, 2024, 16:23:01
    reattribute_data {
      key: 1001
      value: 0.1
    }
    reattribute_data {
      key: 1002
      value: 0.99
    }
    timestamp_end: 1718727781368
    timestamp_start: 1718727771368
    }

    BatteryReattributeEntity{
    	Jun 18, 2024, 16:22:31
    	Jun 18, 2024, 16:22:51
    reattribute_data {
      key: 1003
      value: 1.0
    }
    timestamp_end: 1718727771368
    timestamp_start: 1718727751368
    }

Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage.bugreport
Flag: EXEMPT bug fix
Change-Id: Ie2544b9f43e399d87eb29354b401834372c3a9f7
 2024-06-18 16:37:55 +00:00
J. Eason
411d5c15d3 Merge "Update the icon for the adb wireless pairing code preference." into main am: 2c4ceb385f am: 2ff1438553 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3133784

Change-Id: Iebb2c61faa82309d5e54e6c039c1b00ca6c0f7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 14:44:09 +00:00
J. Eason
2ff1438553 Merge "Update the icon for the adb wireless pairing code preference." into main am: 2c4ceb385f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3133784

Change-Id: Ibd807e3574d695c7887eab5d082e46cdb8cfe1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 14:27:14 +00:00
J. Eason
2c4ceb385f Merge "Update the icon for the adb wireless pairing code preference." into main 2024-06-18 14:14:29 +00:00
Chaohui Wang
c956160fe7 Lazy create InternetPreferenceRepository 
In InternetPreferenceControllerV2, to not created in search indexing for
better performance.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Change-Id: I9e0e36ba6296d48d3761714db52074c90f635233
 2024-06-18 17:26:21 +08:00
Treehugger Robot
5751c90a3a [automerger skipped] Merge "Fix SubscriptionInfoListViewModelTest" into main am: c07341d522 am: 9c803b5dcb -s ours 
am skip reason: Merged-In I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0 with SHA-1 f97e76bc3f is already in history

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

Change-Id: Ic4c891de1e7d6feef4ce7ea06960b33738061c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 08:32:08 +00:00
Chaohui Wang
38c21b187f Merge "Use Kotlin List & NonNull String" into main 2024-06-18 08:21:28 +00:00
Treehugger Robot
9c803b5dcb Merge "Fix SubscriptionInfoListViewModelTest" into main am: c07341d522 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3133028

Change-Id: I823c7c7d02998916ab5f3131ce100b777f3936ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-18 08:06:59 +00:00
J. Eason
b5a82c2f91 Update the icon for the adb wireless pairing code preference. 
The new icon is more specific to adb wireless pairing and will now react correctly to system theme accent color changes.

Bug: 347710454

Change-Id: I7bd25661b2dda83403b41c7ebdf1941437d1d0f8
 2024-06-18 07:58:12 +00:00
Treehugger Robot
c07341d522 Merge "Fix SubscriptionInfoListViewModelTest" into main 2024-06-18 07:51:53 +00:00
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
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