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

141459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
300b455081 Merge 24Q3 (ab/11976889) to aosp-main-future 
Bug: 347831320
Merged-In: Iebec11afc62ecb79386e1866af57cd4e68461a95
Change-Id: Ia81f1e4efd5fc15bfbdace86b53e4cbf49f2022e
 2024-06-18 14:13:44 -07: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
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
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
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
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
Xin Li
87973cf893 Merge "Merge Android 14 QPR3 to AOSP main" into main 2024-06-17 18:51:35 +00:00
Android Build Coastguard Worker
da92e50685 Snap for 11976889 from 9bd19f4604 to 24Q3-release 
Change-Id: I551be4b0fad697dc9ddf06a8f2ed87598cde8566
 2024-06-16 23:58:54 +00: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
Android Build Coastguard Worker
477472fee5 Snap for 11975806 from 68953d33c1 to 24Q3-release 
Change-Id: Id6a9a45d499fba55afc50c12eae2b1e8556eaccf
 2024-06-15 21:22:22 +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
Android Build Coastguard Worker
78628b0361 Snap for 11973804 from bd1a726696 to 24Q3-release 
Change-Id: I9a86cfb9b0514bb06c50c8f43a49951bd38af594
 2024-06-15 01:22:33 +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
josephpv
6780ee79dd Center align illustration is PS setup screen for tablet 
Change made in large screen layout for PS setup screens.
With this change spacing added between the screen title and Illustration
is removed and the illustration is center aligned.

Screenshots:
Tablet
go/ss/Ayvv8YY6yvVoMz4.png
go/ss/6wG342eU64vKdSn.png
go/ss/4H56h5avo7yz9Wz.png

Fold:
go/ss/8xeGeyCYktSzbyc.png
go/ss/97oJmyh6U7fpX8B.png
go/ss/3qmWn4QVB6VPegU.png
go/ss/3KEk3HJ4i7h8jsL.png

Bug: 336235352
Test: Manual
Change-Id: I77148b8b33007a1b29f99fe7bdf3bbc58a9de3aa
 2024-06-14 11:50:33 +00:00
chelseahao
16f9205fb6 [Audiosharing] Add tests for qrcode related classes. 
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: I74caacf43a23bbd0a6da44af24a1be4dd9544a5d
 2024-06-14 11:38:51 +00:00
Chelsea Hao
24d8411915 Merge changes I6322ccbb,Idc96c23d into main 
* changes:
  [Audiosharing] Add tests.
  [Audiosharing] Add logging 3.
 2024-06-14 11:07:49 +00:00
Yiyi Shen
f570ee0018 [Audiosharing] Reset shadows after tests. 
Test: atest
Bug: 345686602
Change-Id: I311ba5c8d234240e61dffd17b4357452c12f4fb1
 2024-06-14 17:44:33 +08:00
SongFerng Wang
0cc20946c8 Merge "Add metricsCategory for dualsim and apnEdit" into main 2024-06-14 09:25:47 +00:00
Treehugger Robot
fbf3403f8d Merge "Reenable all tests for SettingsRoboTests" into main 2024-06-14 08:52:33 +00:00
chelseahao
f6b235746d [Audiosharing] Add tests. 
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: I6322ccbb5deffe2bc169a898ef0208e135caa819
 2024-06-14 08:48:17 +00:00
chelseahao
8a8c89a49c [Audiosharing] Add logging 3. 
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: Idc96c23d20041a00d4fb1e20a7457baaa0f55527
 2024-06-14 08:47:55 +00:00
Matías Hernández
e3570eb633 Merge "Load zen mode type icon options from the proper resources" into main 2024-06-14 08:10:59 +00:00
Tom Hsu
e05b699b04 Merge "Prevent crash when fragment lifecycle is after onStop" into main 2024-06-14 07:56:17 +00:00
Fan Wu
595ed9645e Reenable all tests for SettingsRoboTests 
Updating tests in development/ due to ag/27774179
Temporarily ignore tests in UserDetailsSettingsTest due to ag/27785999

Bug: 347125800

Test: atest
Change-Id: Iaed79c3fde80f5b2c31754bef4a93546813444a8
 2024-06-14 07:27:31 +00:00
Joseph Vincent
f3b59755b4 Merge "Scale PS space animations to display on tablet" into main 2024-06-14 07:16:43 +00:00
Yiyi Shen
2c6b9bb364 [Audiosharing] Increase audio sharing test coverage 
Bug: 345686602
Test: atest
Change-Id: Iec196fc884c3b7ddd580eb8dd13b445d59e3b1b7
 2024-06-14 14:30:14 +08:00
tomhsu
b4108cb17e Prevent crash when fragment lifecycle is after onStop 
Fix: 325059602
Test: build pass
Change-Id: Ie132b4fd6b6c7df8c0fe188e0eb238f562fd4d6e
 2024-06-14 06:02:14 +00:00
songferngwang
d73f0e3c77 Add the timer for waiting sim ready 
When the sim onboarding setup the primary sim,
the psim is not ready.

Bug: 346623465
Test: verified this case.
Change-Id: Ide5a5de4f19deb7de6dd093df4dd267329b82046
 2024-06-14 05:29:22 +00:00
Treehugger Robot
b3aae5aaf1 Merge "Don't show the Wi-Fi icon when Wi-Fi is off" into main 2024-06-14 03:58:01 +00:00
Android Build Coastguard Worker
eaa658f58e Snap for 11967491 from 10c4f84852 to 24Q3-release 
Change-Id: I10bc06e2478f39aec40a0aa81edcb59df8510a95
 2024-06-13 23:22:27 +00:00
songferngwang
d4e467ed4a Add metricsCategory for dualsim and apnEdit 
Bug: 347091697
Test: Build pass
Change-Id: I783a45269112d91d79c00af41c0052ba488603d2
 2024-06-13 23:00:29 +00:00
Bill Yi
02ad59a221 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4db6678bb8e03bcba5ca010165fc247f2689d3ee
 2024-06-13 14:48:04 -07:00
Bill Yi
5d771a4760 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I67dec21c29fa5001e57d712109d66e98ac3bae9b
 2024-06-13 14:46:13 -07:00
Treehugger Robot
66aa660ad5 Merge "fix(high text contrast): revert name back to "High Text Contrast"" into main 2024-06-13 21:22:58 +00:00
Tyler Freeman
40efef2210 fix(high text contrast): revert name back to "High Text Contrast" 
We're holding off on launching High Contrast Text improvements,
so we're reverting back to the original name to avoid user confusion.

We'll save the name change for when we change the appearance of the
feature.

Bug: 344028969
Flag: ACONFIG com.android.settings.accessibility.enable_color_contrast_control NEXTFOOD
Flag: ACONFIG com.android.graphics.hwui.flags.high_contrast_text_small_text_rect STAGING
Test: manual
Change-Id: Icadf1b708b42f684b0d93a59bb7ff8dab26807dd
 2024-06-13 19:37:13 +00:00
josephpv
f1a16e4147 Scale PS space animations to display on tablet 
Screenshots:
b/336235352#comment10

Bug: 336235352
Test: Manual
Change-Id: I05c97756d788d58cd8d553317d3173b8a250348d
 2024-06-13 18:47:48 +00:00
Xin Li
ef55516656 Merge Android 14 QPR3 to AOSP main 
Bug: 346855327
Merged-In: If518bbb88342ae4c2e5e9f131727de58446be780
Change-Id: I4384e446922d66808c73cbf52627f2e8db7fa7af
 2024-06-13 10:50:27 -07:00
Natnael Belay
10c4f84852 Merge "Temporarily ignore 2 ApnEdit tests" into main 2024-06-13 16:49:25 +00:00