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

141165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Treehugger Robot
a02b1c3aa2 Merge "Settings: fix unexpected routing selection" into main 2024-07-05 06:46:04 +00:00
hoffc
99e33291d3 Settings: fix unexpected routing selection 
setRouterGroupId in WifiDisplayPreferenceController will result in unexpected routing selection in MediaRouter, which will lead to WFD scanning not be triggered when entering WFD settings page if there is one remembered WFD device exists before reboot.

Remove the set group id call.

Bug: 351110755

Change-Id: I0d434543338d9896116541963f31e4669d877ea8
 2024-07-04 09:02:23 +00:00
Pawan Wagh
86a9e06419 Repost PageAgnostic mode notification when dismissed 
Device is in experimental mode when using 16kB developer option.
When the notification is dimissed, repost it again.

Bug: 351029724
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: Ie579b6c4dd060b165c6cc8ae635d48e257d49bec
 2024-07-03 22:00:45 +00:00
Alina Zaidi
7b4fcc6006 Merge "Update OWNERS for DesktopModePreferenceController" into main am: ed9bccb0b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3159736

Change-Id: I79c2dd015ce63fa0fe658daf486971f48917f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-03 17:37:22 +00:00
Alina Zaidi
ed9bccb0b3 Merge "Update OWNERS for DesktopModePreferenceController" into main 2024-07-03 16:42:23 +00:00
Alina Zaidi
a059eabdb3 Update OWNERS for DesktopModePreferenceController 
Change-Id: I446525a06480a27f80e530c65181fd31f43a9ef8
Test: N/A
Flag: EXEMPT Ownership cannot be flagged
 2024-07-03 16:22:23 +00:00
Pawan Wagh
fdd68f473b Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f58 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445

Change-Id: I0c2f3c0445e06e63a26cc69efa326c8ccabf0e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-03 15:36:52 +00:00
Pawan Wagh
b6fc7a6f58 Merge "Fix flaky test for persistent notifications" into main 2024-07-03 15:14:25 +00:00
SongFerng Wang
7423e21ba3 [automerger skipped] Merge "Fix AppBatteryPreferenceTest flaky" into main am: 5462789fae -s ours 
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history

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

Change-Id: I801504ca58905818b24c761bd4b331cac195857f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-03 09:47:55 +00:00
Chaohui Wang
362df0c72b [automerger skipped] Fix AppBatteryPreferenceTest flaky am: 6a6a263177 -s ours 
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history

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

Change-Id: Icc52784d754185fad53557d964344f267940d8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-03 09:47:50 +00:00
SongFerng Wang
5462789fae Merge "Fix AppBatteryPreferenceTest flaky" into main 2024-07-03 09:34:52 +00:00
Pawan Wagh
999b8a9f33 Fix flaky test for persistent notifications 
Persistent notifications test sometimes fails due
to setup activity doesn't exit due to failed intent.
Adding setup exit command when on device tests are starting and
adding timeout for transition.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Bug: 349820489
Change-Id: Iaf1c1f481612367bbce919b27e89f88a24abb582
 2024-07-02 23:57:57 +00:00
Chaohui Wang
6a6a263177 Fix AppBatteryPreferenceTest flaky 
Bug: 350448913
Test: unit test
Merged-In: I5a1753835d2d47712ea249081c9a77c455eb3291
Change-Id: I5a1753835d2d47712ea249081c9a77c455eb3291
 2024-07-02 23:28:49 +00:00
Treehugger Robot
97f101474a Merge "Fix UI issues in localization" into main am: ce20ff98e3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3151118

Change-Id: If588199369afe82c6c84a1772bba2462997a70b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-28 22:20:43 +00:00
Treehugger Robot
ce20ff98e3 Merge "Fix UI issues in localization" into main 2024-06-28 22:04:35 +00:00
Pawan Wagh
234872e187 Fix UI issues in localization 
- Some of the locales don't display entire text and BigTextStyle doesn't
display ellipsis for them. Removing bigText.
- Fixing strings to display 4KB
- Reduce string for bootloader unlock title

Bug: 345291007
Bug: 343893991
Bug: 343815951
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: I3e5bf9bf70be1240cfe7d3a381bb8fef62ce2efa
 2024-06-27 19:49:38 +00:00
Jason Chiu
6234e5a2fb Merge "Allow the background activity start from legacy suggestion cards" into main am: d78409d41f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3148096

Change-Id: If973cd5c6aa3d743fc7e764b8c59101311ad06ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-27 04:35:52 +00:00
Jason Chiu
d78409d41f Merge "Allow the background activity start from legacy suggestion cards" into main 2024-06-27 04:14:16 +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
Chaohui Wang
ad93026e3b Fix Apn network type tests 
Bug: 347114536
Test: unit test
Change-Id: Ib5bd331e9a28e89e426bf423e6086d1c2d288961
Merged-In: Ib5bd331e9a28e89e426bf423e6086d1c2d288961
(cherry picked from commit 288b40ee4f)
 2024-06-21 01:52:18 +00:00
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
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
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