PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
144,410 Commits 1 Branch 0 Tags
a2085f18b759f012bd4445b283abbbd31918db2f
Commit Graph

144410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua McCloskey
a2085f18b7 Fast enroll 
Test: manual
Bug: 375320734
Flag: com.google.android.settings.flags.pixel_fingerprint_enroll
Change-Id: Iaf3acfca8471165514660a2403e69be161392501
 2024-12-02 17:07:59 +00:00
Treehugger Robot
93e24594c5 Merge "[Catalyst] Allow external SET for Use Battery Saver" into main 2024-11-14 18:05:29 +00:00
Wes Okuhara
0081fa0d68 Merge "Settings: Fix queryShortcuts_shouldSortBasedOnPriority test" into main 2024-11-14 17:58:37 +00:00
Treehugger Robot
f9ea2a52d3 Merge "Exclude implicit modes from the summary of the Modes entry in Settings" into main 2024-11-14 17:55:43 +00:00
Wes Okuhara
33a7b96f5f Settings: Fix queryShortcuts_shouldSortBasedOnPriority test 
Previously this test asserted that the resulting ActivityInfo instances
from the queryShortcuts() method were the same address. While this can
assert general equality, it is more robust to assert the resulting
ResolveInfos- mainly that they are sorted by priority.

Bug: b/314924127
Test: atest SettingsRoboTests:com.android.settings.shortcut.CreateShortcutPreferenceControllerTest
Flag: TEST_ONLY
Change-Id: I00210440c7c1a87a6f8eb7a2866ae8571ec7d053
 2024-11-14 16:54:46 +00:00
Matías Hernández
0baf70a4b3 Exclude implicit modes from the summary of the Modes entry in Settings 
They are called "Do Not Disturb (App)" which places alphabetically near the top (in English). This can often result in a summary like "DND, Bedtime, DND (App)", which looks silly.

Fixes: 379089451
Test: atest ZenModeSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: Id41caee09cca874297ca12d2ac934aed3f9a43ab
 2024-11-14 15:33:54 +00:00
Treehugger Robot
229a1dbca3 Merge "Fix WifiCallingSettingsForSubTest" into main 2024-11-14 12:38:00 +00:00
Treehugger Robot
f7478a6546 Merge "[Settings] Refactor: Add SystemLocalePickerFragment" into main 2024-11-14 09:26:27 +00:00
Fan Wu
40b8917b57 Fix WifiCallingSettingsForSubTest 
Bug: 378832412
Test: atest
Flag: EXEMPT fix test
Change-Id: Id45f472e87371eb00ba3412a39ccda5af5723e4b
 2024-11-14 08:55:20 +00:00
Sunny Shao
64c83d498f [Catalyst] Allow external SET for Use Battery Saver 
NO_IFTTT=Catalyst only

Test: devtool
Bug: 377993674
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Change-Id: I8f1aa27150ca9a6d581d3132b4dbd51bce78ee68
 2024-11-14 16:16:52 +08:00
Treehugger Robot
7fee935c4f Merge "Ignore the test case that's been failing for a month" into main 2024-11-14 08:01:45 +00:00
Fan Wu
52b8bc332d Ignore the test case that's been failing for a month 
Bug: 377633438

Test: atest

Flag: EXEMPT test
Change-Id: I5033365154406cd7f7828bd5224ae169332e9639
 2024-11-14 15:16:37 +08:00
Zoey Chen
a15948b53e [Settings] Refactor: Add SystemLocalePickerFragment 
Bug: 377664066
Flag: EXEMPT refactor
Change-Id: I79805c639197911d10f3632e50b5feced08c2fd6
 2024-11-14 07:05:30 +00:00
Treehugger Robot
a869e573a0 Merge "Update resource name and format previously added file" into main 2024-11-14 06:56:14 +00:00
Treehugger Robot
f70d273de6 Merge "Fix NetworkProviderSettingsTest" into main 2024-11-14 05:18:57 +00:00
Jason Chang
97539b3255 Merge "(1/n) Make the GlifHeader scrollable on FingerprintEnrollEnrolling( UDPFS) layout page." into main 2024-11-14 05:13:09 +00:00
Treehugger Robot
dbad78f0f6 Merge "Add android:key to device info PreferenceCategories" into main am: fb6902d872 am: a320592887 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3330454

Change-Id: I62f4bc79d5518a43506eefeaa0fd24e2e34db04b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 04:54:17 +00:00
Jacky Wang
8f548123f4 Fix NetworkProviderSettingsTest 
Bug: 378989988
Flag: TEST_ONLY
Test: atest
Change-Id: Ia3781417210585a77374e5ddedf8ba67278ad397
 2024-11-14 12:31:45 +08:00
Treehugger Robot
a320592887 Merge "Add android:key to device info PreferenceCategories" into main am: fb6902d872 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3330454

Change-Id: I2ff9911ca626b0144ad18721122cb5cbeb26f84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 04:19:25 +00:00
Treehugger Robot
fb6902d872 Merge "Add android:key to device info PreferenceCategories" into main 2024-11-14 03:50:28 +00:00
Fan Wu
b551184b15 Update resource name and format previously added file 
Bug: 372774754
Test: atest and device test
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: Iaa6a07108c4401e844e1a1e19f07fc809e4c43c9
 2024-11-14 03:33:57 +00:00
Fan Wu
14ba0b6571 Merge "Revert "Revert "Migrate Battery percentage preference into catal..."" into main 2024-11-14 03:24:54 +00:00
Fan Wu
a794e01d45 Revert "Revert "Migrate Battery percentage preference into catal..." 
Revert submission 30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI

Reason for revert: the failures is part of the robolectric issue b/378822459. Tested locally that the change is not breaking ClockworkSetupWizardRoboTests.

Reverted changes: /q/submissionid:30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI

Change-Id: I2210002924650cb54c55a41be25d97a3997c065e
 2024-11-14 01:59:16 +00:00
Bill Yi
33008bc693 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours am: 9e6155da79 -s ours am: 13bc12e33a -s ours am: 3b34ea671e -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie52150fe73e0610016f449bb9ee306a3d64a3cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 01:58:36 +00:00
Bill Yi
3b34ea671e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours am: 9e6155da79 -s ours am: 13bc12e33a -s ours 
am skip reason: contains skip directive

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

Change-Id: If5c65e9f66b3dd4e6d0b9e4968a4d075f1c266f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 01:11:54 +00:00
Bill Yi
4b96a98baf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours am: 9e6155da79 -s ours am: eaefa87f37 -s ours 
am skip reason: contains skip directive

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

Change-Id: I54d9f26d222d59f7667c80726b572cfcda3d9757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 01:11:34 +00:00
Treehugger Robot
70192430c3 Merge changes from topic "catalyst" into main 
* changes:
  Ignore failing NetworkDashboardScreenTest
  [Catalyst] Update SettingsService
 2024-11-14 01:10:39 +00:00
Bill Yi
eaefa87f37 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours am: 9e6155da79 -s ours 
am skip reason: contains skip directive

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

Change-Id: I537639af4c9331cf5f901ccfa23dfc91756fd88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 00:49:25 +00:00
Bill Yi
13bc12e33a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours am: 9e6155da79 -s ours 
am skip reason: contains skip directive

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

Change-Id: I122a4c7b7656fdd9468e65166f32cf695129c620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 00:47:44 +00:00
Bill Yi
9e6155da79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours 
am skip reason: contains skip directive

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

Change-Id: I159af6766d0fbf51263b7453a1f2ab749410277d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 00:25:02 +00:00
Xin Li
91195f39f7 [automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: cfa19e11a6 -s ours 
am skip reason: Merged-In Ie90e7495dd4a134538bae6e3e08eea0d02134b14 with SHA-1 62449dd61b is already in history

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

Change-Id: I11bcec2767b9cf595fcb077ccf2a1cdbf0d2d7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 23:25:15 +00:00
Jacky Wang
66d6b92637 Ignore failing NetworkDashboardScreenTest 
Bug: 368359883
Flag: TEST_ONLY
Test: atest
Change-Id: I3c6051fdd83376d7a56e0fffa157a7315431f841
 2024-11-14 07:07:02 +08:00
Bill Yi
56de354bdb Import translations. DO NOT MERGE ANYWHERE 
BUG:377687053

Auto-generated-cl: translation import
Change-Id: I05db00761923bf98f069ef14f4b89a56c8a812dc
 2024-11-13 22:43:37 +00:00
Jacky Wang
9a8fe4107d [Catalyst] Update SettingsService 
Bug: 373895596
Flag: com.android.settings.flags.catalyst_service
Test: Manual
Change-Id: I64d0b7bac3415894a8478fafe09b5f5d1a0ebb51
 2024-11-14 03:52:41 +08:00
Guojing Yuan
b29b9b1b11 Merge "Remove the margin in Device Detail page" into main 2024-11-13 17:52:51 +00:00
Jason Chang
e4623cd2a3 (1/n) Make the GlifHeader scrollable on FingerprintEnrollEnrolling( 
UDPFS) layout page.

1. To override GlifLayout's onInflateTemplate() then embedding a
ScrollView on GlifHeader.
2. Remove previous hiding the description text snippet
3. Handling UDFPS enroll lottie position problem.
4. Solve the ProgressBar overlapped with FooterBar problem.

Flag: com.android.settings.flags.enroll_layout_truncate_improvement

Bug: 359149850
Bug: 367164671
Bug: 362522976

Test: atest UdfpsEnrollEnrollingViewTest
Test: Build Forrest ROM then check the UI in different scenarios
Change-Id: Iee44cb5815286233f23266e3d86fd8335ab2087d
 2024-11-13 16:26:32 +00:00
YK Hung
0ce5caf47b [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours am: 2901d2948e -s ours am: e0493334ee -s ours am: 4426362dca -s ours 
am skip reason: contains skip directive

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

Change-Id: I8dace101be77321ef591b5c29105494a997098eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:35:06 +00:00
Jay Wang
c32e31d9f6 [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours am: 954a3bd85a -s ours am: 1d6753e339 -s ours am: 11558bd4b9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I3dccb6d138cf44feb03dab2d39306e0c374b8f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:35:01 +00:00
ELIYAZ MOMIN (xWF)
2bd5ef25bd Merge "Revert "Migrate Battery percentage preference into catalyst. Ref..."" into main 2024-11-13 15:16:23 +00:00
YK Hung
4426362dca [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours am: 2901d2948e -s ours am: e0493334ee -s ours 
am skip reason: contains skip directive

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

Change-Id: Id35aa44c6c437756a1b6e4bc77962667953f1346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:11:47 +00:00
Jay Wang
11558bd4b9 [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours am: 954a3bd85a -s ours am: 1d6753e339 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2ca5dc3467ad397a2902df33da71588746e51a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:11:41 +00:00
YK Hung
43979f7905 [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours am: 2901d2948e -s ours am: 108a184888 -s ours 
am skip reason: contains skip directive

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

Change-Id: I7c00a9c9276847ffe480610fb72e3d47da42b175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:11:30 +00:00
Jay Wang
c32df9db80 [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours am: 954a3bd85a -s ours am: f88ab1fa2d -s ours 
am skip reason: contains skip directive

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

Change-Id: I26d802b3f2d3b6857928250483691637bb2880b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:11:23 +00:00
YK Hung
108a184888 [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours am: 2901d2948e -s ours 
am skip reason: contains skip directive

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

Change-Id: I7a76ffacc1fb1bffcc28c307f192ca63dee649ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:38:56 +00:00
Jay Wang
f88ab1fa2d [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours am: 954a3bd85a -s ours 
am skip reason: contains skip directive

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

Change-Id: I9922b4c4a00e1d439d76dc19396310fc0312e0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:38:52 +00:00
YK Hung
e0493334ee [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours am: 2901d2948e -s ours 
am skip reason: contains skip directive

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

Change-Id: I982c0bdddb664eb11ba57a757f48167794a0a8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:37:19 +00:00
Jay Wang
1d6753e339 [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours am: 954a3bd85a -s ours 
am skip reason: contains skip directive

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

Change-Id: I3539bf908be2a2524989d486407a7ecccfaf730b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:37:13 +00:00
YK Hung
2901d2948e [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icbb954270e7c17821ec59a147a66d1d7f8a06d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:16:22 +00:00
Jay Wang
954a3bd85a [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4e528f792bc6b94934d0d35e5a8d8de4fe846f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:16:12 +00:00
YK Hung
5a5550e4e5 Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev 2024-11-13 13:57:53 +00:00