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

141338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
e2d326beeb Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future 
Bug: 347831320
Merged-In: I2489a64804f068a957f9be3f87847d6911b24447
Change-Id: I1885ef34f69ac4eb6e76ac903fcacdebe4139ae1
 2024-08-08 11:41:20 -07:00
Treehugger Robot
12c60990a6 [automerger skipped] Merge "Add missing required permissions for Settings" into main am: eb79f88253 -s ours 
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

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

Change-Id: I2467eef95775cda018558a951233431e45487f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-07 08:45:34 +00:00
yomna
12eb946b55 [automerger skipped] Add missing required permissions for Settings am: a23b057db2 -s ours 
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

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

Change-Id: Ie56ecc6d5230876d92913b648540d52d0167e4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-07 08:45:29 +00:00
Treehugger Robot
eb79f88253 Merge "Add missing required permissions for Settings" into main 2024-08-07 08:25:55 +00:00
yomna
a23b057db2 Add missing required permissions for Settings 
SettingsSpaUnitTests BackgroundInstalledAppsPageProviderTest#title_displayed is failing due to
missing permissions GET_BACKGROUND_INSTALLED_PACKAGES, which is required for the test.

Fix: 357970545
Test: m & atest SubscriptionInfoListViewModelTest SettingsSpaUnitTests
Change-Id: I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8
Merged-In: I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8
 2024-08-07 07:53:01 +00:00
Treehugger Robot
550a4253ed Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-08-07 06:31:13 +00:00
Treehugger Robot
e5d3e4b6f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-08-07 06:31:13 +00:00
Bill Yi
734f9c13ec Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iadb5679a0adf0967e9bca8bb205376f06fc46d3b
 2024-08-06 17:11:21 -07:00
Bill Yi
97b9986d5c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie79f4a00fd2faa6f1f8131691c10e3d46456424b
 2024-08-06 17:09:33 -07:00
Bill Yi
6c0c6b61c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieaf59078e8adaae4d3a03fe0ae3f47ec4e2e913a
 2024-08-06 17:08:00 -07:00
Treehugger Robot
5079417396 Merge "Remove unecessary logs" into main am: 5e487ed591 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191355

Change-Id: Ifa53f9c0acf7e57ee6a2c1e2fad9e094612aea0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-29 02:16:39 +00:00
Treehugger Robot
5e487ed591 Merge "Remove unecessary logs" into main 2024-07-29 01:43:55 +00:00
Treehugger Robot
88f79fe29d Merge "Migrate to onViewCreated in DataSaverSummary" into main am: 04ed8498ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3188139

Change-Id: Ib0e4725e3b490e70d9518a2f02c418de2216e638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-28 21:06:34 +00:00
Treehugger Robot
04ed8498ee Merge "Migrate to onViewCreated in DataSaverSummary" into main 2024-07-28 20:52:34 +00:00
Treehugger Robot
ee6f5cf1ed Merge "Make adb team OWNERS of all Adb settings" into main am: 998787ffa8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3195878

Change-Id: Idcd085b62b69bace7ddfda325b1645b6b89440ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-26 18:25:24 +00:00
Treehugger Robot
998787ffa8 Merge "Make adb team OWNERS of all Adb settings" into main 2024-07-26 18:01:59 +00:00
Fabien Sanglard
c7adef9634 Make adb team OWNERS of all Adb settings 
Test: NA
Bug: 355088188
Flags: NA
Change-Id: I59c037765940a26509f1d312b4c8c2e0105a3580
 2024-07-26 10:57:43 -07:00
Yuanru Qian
6190b5eb70 Merge "Developer option crashed when Bluetooth feature disabled" into main am: cff856a8bb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3172099

Change-Id: Idaa295aa767f900acc88da42bc838b7081c69504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-25 04:29:10 +00:00
Yuanru Qian
cff856a8bb Merge "Developer option crashed when Bluetooth feature disabled" into main 2024-07-25 03:31:43 +00:00
Yuanru Qian
97f922d60c Merge "Remove ex-team members from OWNERS" into main am: 8303a38d10 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191891

Change-Id: I39c450800b0a3fc08d7cab8e74ff7318f753cbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-24 10:27:41 +00:00
Yuanru Qian
8303a38d10 Merge "Remove ex-team members from OWNERS" into main 2024-07-24 10:06:07 +00:00
Yuanru Qian
3fac9ad21b Remove ex-team members from OWNERS 
Change-Id: I025d4963e5b63a28fb0fe36df8a4e1fdd76a9b3d
 2024-07-24 09:41:31 +00:00
Pawan Wagh
d519d1fbaa Remove unecessary logs 
Test: m Settings
Bug: N/A
Flag: NONE remove logging
Change-Id: Ib1e5923e2f10fdf5fa29bbaa24b74874c18c3045
 2024-07-23 22:19:22 +00:00
chayemme
ec6e93f3f4 Developer option crashed when Bluetooth feature disabled 
When Bluetooth feature is disabled, crash observed with developer option
is selected

Bug: 352864331
Change-Id: If4239f710847f2e01a3b419e1ce6f783f0522219
 2024-07-23 13:05:29 +00:00
Ram Peri
119d1e9f43 Merge "Robolectric upgrade" into main am: 71b2be5571 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301

Change-Id: I9469f534e375c589f0a7dbac20f185f61ae69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-23 01:08:54 +00:00
Ram Peri
71b2be5571 Merge "Robolectric upgrade" into main 2024-07-23 00:28:56 +00:00
Ram Peri
f5b58ea3be Robolectric upgrade 
Test: atest SystemUIGoogleRoboRNGTests
Flag: TEST_ONLY
Change-Id: I833ac67223875480994f947907754290bb25c946
 2024-07-22 13:48:09 -04:00
Jyotiraditya Panda
4ff23211dd Migrate to onViewCreated in DataSaverSummary 
The onActivityCreated method has been deprecated. This change updates
DataSaverSummary to use onViewCreated instead, which is the recommended
method for initializing views after the fragment's view has been created.

Test: manual
Change-Id: I08daa11b557b05441fa4f7ed0019802d991846e3
Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>
 2024-07-22 20:18:08 +05:30
Android Build Coastguard Worker
768511b956 Merge cherrypicks of ['googleplex-android-review.googlesource.com/28036491'] into 24Q3-release. 
Change-Id: Ife612928a2651d27322d7a4da6ad469b530759e4
 2024-07-20 07:19:36 +00:00
David Anderson
80e709f926 Allow overriding DeviceDiagnosticsPreferenceController. 
Allow devices to specify their own flags by overriding this class.
Additionally, fix a missing PackageManager lookup in getIntent().

Bug: 348647186
Test: launch Settings on Pixel and on AOSP
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:287181169485eb30203c7b698b1f8ee618059e29)
Merged-In: I2489a64804f068a957f9be3f87847d6911b24447
Change-Id: I2489a64804f068a957f9be3f87847d6911b24447
 2024-07-20 07:05:32 +00:00
SongFerng Wang
bce8fc79e8 Merge "Fix SmartForwardingActivity crash at screen rotation" into main am: 14393a5f06 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2855525

Change-Id: Ieb6ffb8c2f479ffcc30d60440df649618074e420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-19 05:55:14 +00:00
SongFerng Wang
14393a5f06 Merge "Fix SmartForwardingActivity crash at screen rotation" into main 2024-07-19 05:41:40 +00:00
SongFerng Wang
e910d895f1 Merge "Settings: Adapt edge-to-edge enforcement" into main am: 9befb6cd8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3142636

Change-Id: Ibfc5f8fb007d93d618c4a0c67e396677329b5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-18 09:48:49 +00:00
SongFerng Wang
9befb6cd8f Merge "Settings: Adapt edge-to-edge enforcement" into main 2024-07-18 09:31:55 +00:00
Tom Hsu
72541b8b19 Merge "Fix network can't handle simultaneously SS request for both subs" into main am: f20f297cfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2643178

Change-Id: Id6f676ba5fe1ae096c6b3ed0ed75a00e2c1d92e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-17 07:13:32 +00:00
Tom Hsu
f20f297cfa Merge "Fix network can't handle simultaneously SS request for both subs" into main 2024-07-17 06:56:04 +00:00
Edgar Wang
ff519515b6 Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main am: 969c26392d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3176079

Change-Id: Id9f83a06f922904ddf56ed803fa58cd362eba59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-17 01:13:36 +00:00
Edgar Wang
969c26392d Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main 2024-07-17 00:53:02 +00:00
Tetiana Meronyk
c641849a42 Add Multiuser team to the OWNERS file for users package in Settings 
Bug: 352721898
Change-Id: Ica47025c4ba5033a15422931fd9f8ed85ae97e9e
Test: N/A
 2024-07-16 12:05:25 +00:00
Android Build Coastguard Worker
6c50d62205 Merge cherrypicks of ['googleplex-android-review.googlesource.com/28239007'] into 24Q3-release. 
Change-Id: I84f3268cac0e36c04cc31f69463819ad4d2c7739
 2024-07-12 04:04:19 +00:00
Bill Yi
fe573b7c32 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

Bug: 347053373
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6049e1654f4bfe159ea6593c06c33a575af49f7f)
Merged-In: I8981cb6502032271a5617fa7555ddca24d46d975
Change-Id: I8981cb6502032271a5617fa7555ddca24d46d975
 2024-07-12 03:53:10 +00:00
Android Build Coastguard Worker
31e8c6d57d Merge cherrypicks of ['googleplex-android-review.googlesource.com/28121446'] into 24Q3-release. 
Change-Id: I062a7bf67678f78f60f360df0590c9b12b9c75a5
 2024-07-11 04:33:00 +00:00
Zaiyue Xue
dc841cd077 AiCore reattribute feature 
Bug: 344438848
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:164e2be9380ef0df6afe7616fb0bedc8eea6f899)
Merged-In: Ifb18c2d156d11fcfdc67cff575ba800c4a6cc0fe
Change-Id: Ifb18c2d156d11fcfdc67cff575ba800c4a6cc0fe
 2024-07-11 04:25:14 +00:00
Android Build Coastguard Worker
9e96efe1ca Merge cherrypicks of ['googleplex-android-review.googlesource.com/27790489'] into 24Q3-release. 
Change-Id: I5bf530e58bbfd030f36b442fc42f43bd6bcd91c1
 2024-07-10 05:24:18 +00:00
Haijie Hong
3ecc4b93bb Determine Spatial Audio AudioDeviceAttributes by BT profile state 
Test: atest BluetoothDetailsSpatialAudioControllerTest
Bug: 341005211
Flag: com.android.settingslib.flags.enable_determining_spatial_audio_attributes_by_profile
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4296b30dcf879701a9bf614b37b45d5f1d886fe4)
Merged-In: I1436019d239414c3855d506dcf35d736c8428e0a
Change-Id: I1436019d239414c3855d506dcf35d736c8428e0a
 2024-07-10 05:15:33 +00:00
Treehugger Robot
f7486fc4a5 Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160058

Change-Id: Ia7ae95a0988aa1e63669af5485ca25ef31993c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-09 17:40:34 +00:00
Treehugger Robot
9a492ca3cb Merge "Repost PageAgnostic mode notification when dismissed" into main 2024-07-09 17:27:16 +00:00
Android Build Coastguard Worker
a679588159 Merge cherrypicks of ['googleplex-android-review.googlesource.com/28146460'] into 24Q3-release. 
Change-Id: If94fd151774f307d0b5fd23337bad4c46bc25d13
 2024-07-09 03:01:37 +00:00
Rubin Xu
532aef2d0e Fix certificate manager UI (take 2) 
Change layout height so it does not obscure the floating
action buttons at the bottom.

Bug: 349518143
Flag: EXEMPT bug fix
Test: manual CTS Verifier run
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0922f282d8a0eb8ec818323485ea2bdb196c8185)
Merged-In: Iaf82b2e6343790bbed9508a5dae9a66566760cac
Change-Id: Iaf82b2e6343790bbed9508a5dae9a66566760cac
 2024-07-09 02:41:45 +00:00
Treehugger Robot
226c0d5487 Merge "Settings: fix unexpected routing selection" into main am: a02b1c3aa2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160065

Change-Id: I6ccacc71a9848cc2f030fb2612f3762172e893ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-05 07:17:38 +00:00