PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,840 Commits 1 Branch 0 Tags
c645f16c84b0b8f28197218e04b2f0c8ab83ade9
Commit Graph

117840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
c645f16c84 [automerger skipped] Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554 am: 48dc0133ce am: f526772dcd -s ours 
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Icbfca3b0dd4f9c9f54f46d087e81135a84919f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 13:22:25 +00:00
Ben Murdoch
f526772dcd Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554 am: 48dc0133ce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319949

Change-Id: I4edb11e2c2c71cc7ec4ff7b82ad18a3d6d5471d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 12:50:29 +00:00
Ben Murdoch
48dc0133ce Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319949

Change-Id: I7647c859fe8196e0af0e5c2871918f0940a9fe0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 12:25:02 +00:00
Ben Murdoch
39d6e92554 Merge "Revert "[Settings] configuration for hidding SIM settings UI"" 2022-11-28 11:54:46 +00:00
Chaohui Wang
d85cb3e009 Merge "Fix flicker of AppButtons" 2022-11-28 11:54:12 +00:00
SongFerng Wang
6e5b8e4748 Merge "Move the auto data switch preference into DDS sim" 2022-11-28 11:21:40 +00:00
Bonian Chen
590abcbbf2 Revert "[Settings] configuration for hidding SIM settings UI" 
This reverts commit 6477275296.

Reason for revert: Build breakage

Log: https://android-build.googleplex.com/builds/branches/aosp-main-16k-throttled/grid?head=9340544&tail=9338589

Bug: 240515161
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: Ife727bc8b8bddafb58eed0d13d5d19fd1bf0a43e
 2022-11-28 11:08:25 +00:00
TreeHugger Robot
76eabc6c7c Merge "Invoke the cursor.close() after loading data from database." 2022-11-28 10:53:43 +00:00
Bonian Chen
26cecb679f [automerger skipped] Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad am: f7090ebbee am: 011cdf6ef0 -s ours 
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9 is already in history

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

Change-Id: I78cb592d8b30f349661cc0bf024165eb71c66e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 09:21:59 +00:00
Bonian Chen
011cdf6ef0 Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad am: f7090ebbee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319109

Change-Id: I739f417c3d19b22bc102c9a1e0253692008bd370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 08:50:08 +00:00
Kuan Wang
5285597dee Invoke the cursor.close() after loading data from database. 
Test: make RunSettingsRoboTests + manual
Bug: 258099535
Change-Id: Ie8d8f5294fff6e44b7151e22f9ae7b5b53cd5d6d
 2022-11-28 16:37:53 +08:00
Chaohui Wang
d70dbe408a Fix flicker of AppButtons 
Also remove check for isSystemModule(), since it's also covered by
AppUtils.isMainlineModule().

Bug: 236346018
Test: Unit test
Test: Manually with Settings
Change-Id: Icf8245145a2b2af98847db6040b9e5e930788d4f
 2022-11-28 16:30:37 +08:00
Chaohui Wang
d2378be135 Merge "Add restriction to AppInfoSettingsMoreOptions" 2022-11-28 08:27:22 +00:00
Bonian Chen
f7090ebbee Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319109

Change-Id: Iecaa9d4101864eaaeab0d5fc14277d39a9647682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 08:24:30 +00:00
Bonian Chen
697f570fad Merge "[Settings] configuration for hidding SIM settings UI" 2022-11-28 08:02:29 +00:00
SongFerngWang
28ce6b9057 Move the auto data switch preference into DDS sim 
Bug: 253698164
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AutoDataSwitchPreferenceControllerTest
Change-Id: I0aee5454e3a57a373b9eea2108c39335e4277f7b
 2022-11-28 15:36:18 +08:00
Angela Wang
a6a7e029d7 Merge "Shows LE audio hearing aid device in a11y settings page (3/3)" 2022-11-28 07:16:25 +00:00
Kuan Wang
6e242c29a8 Merge "Use the field isFullChargeCycleStart in database to get the last full charge cycle start and remove the unused SharedPreference." 2022-11-28 06:44:42 +00:00
TreeHugger Robot
9ee0556e04 Merge "Update page id enum for NFC default payment selection page" 2022-11-28 06:21:27 +00:00
Chaohui Wang
3b05ba6da8 Add restriction to AppInfoSettingsMoreOptions 
The DISALLOW_APPS_CONTROL restriction.

Bug: 259492166
Test: Unit test
Test: Manually with Settings
Change-Id: Id92e36194201412a0d5cad71410c08508a3b8aaa
 2022-11-28 13:30:57 +08:00
Ankita Vyas
932874130e Merge "Show apps from user and all of its profiles in recents category." 2022-11-28 05:09:35 +00:00
Kuan Wang
2b93d40683 Use the field isFullChargeCycleStart in database to get the last full 
charge cycle start and remove the unused SharedPreference.

Test: make RunSettingsRoboTests + manual
Bug: 253553141
Change-Id: I74ef71775fa5d4871077f6d5573467aa5843bc6b
 2022-11-28 11:27:24 +08:00
Jack Yu
50f657e1d5 Update page id enum for NFC default payment selection page 
Bug: 260060603
Test: build pass
Change-Id: I6f3da2223a455f8dfe6b8c5be13af37f933202b8
 2022-11-28 02:57:09 +00:00
Chaohui Wang
bf26483af5 Merge "Reduce flaky of App Info tests" 2022-11-28 02:39:14 +00:00
TreeHugger Robot
41a77adafb Merge "Add page id enum for storage settings" 2022-11-27 06:10:59 +00:00
Chaohui Wang
e62377a1e7 Reduce flaky of App Info tests 
Bug: 236346018
Test: Unit test
Change-Id: If810ef57675b8fb3bab533360bb62cc41a8cc9d8
 2022-11-26 21:04:45 +08:00
Vincent Wang
2687db5de2 Merge "Add test for FingerprintEnrollment" 2022-11-26 08:13:56 +00:00
Bonian Chen
6477275296 [Settings] configuration for hidding SIM settings UI 
Hide SIM settings UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I13ae0909d0120039cdfe8298a6892195de2fb122
 2022-11-25 22:57:50 +00:00
Treehugger Robot
e9efc02e08 [automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435 -s ours am: b02050cbe1 -s ours am: b6c140e7f2 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I21ef50cf23575444c0d0a29236f6c324f0756e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 16:16:54 +00:00
Bonian Chen
efa2b04507 [automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256 -s ours am: f10535cf6c -s ours am: 63cfa3a674 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I9e41cb241e6bcd665cd59a00e2b9b8428f72c581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 16:16:47 +00:00
Treehugger Robot
b6c140e7f2 [automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435 -s ours am: b02050cbe1 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: Ib15bf621b3d56568377641574cf42bb6dee6bffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:43:51 +00:00
Bonian Chen
63cfa3a674 [automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256 -s ours am: f10535cf6c -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I62dd0bbfe49f8add5ca1c5234f31890efef190a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:43:49 +00:00
Treehugger Robot
b02050cbe1 [automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I6c76e1df48a75f49d99beb22eaff8109de6cc676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:15:31 +00:00
Bonian Chen
f10535cf6c [automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I4cdcaa6ec1485f6f592a5633d317d3329d1cd632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:15:29 +00:00
Treehugger Robot
6685055435 Merge "[Settings][port] configuration for hidding SIM related UI" 2022-11-25 14:42:14 +00:00
SongFerng Wang
19518a7c83 Merge "The page id SettingsEnums.DIALOG_PREFERRED_SIM_PICKER is duplicated" 2022-11-25 14:25:58 +00:00
Bonian Chen
b644c54256 [Settings][port] configuration for hidding SIM related UI 
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Merged-In: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
Change-Id: I67166b0db08635ee2bc01a8208f96126b64fd0a7
 2022-11-25 13:54:35 +00:00
TreeHugger Robot
8b6abe047c Merge "Apply new metrics to make App info dialogs have their own unique id" 2022-11-25 09:59:08 +00:00
Zhenwei Chen
41ce87729e Fix LoaderCallback.onLoadFinished uncalled issue 
When two loaders started almost at the same time,
it is possible onLoadFinished is never called.

Bug: 256523472
Test: Unit tests passed and manual test on device
Change-Id: I41a041d5878f9930db44775408380d0d4588faba
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
 2022-11-25 16:01:04 +08:00
Vincent Wang
bdebd9f346 Add test for FingerprintEnrollment 
Bug: 259504907
Test: atest SettingsUITests:FingerprintEnrollmentTest
Change-Id: If7a8a7124b685f4517880517afc7f17b07c0ad29
 2022-11-25 15:01:48 +08:00
Pasty Chang
db61f1fc4c Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev am: 3bde8a502e am: 0b61859b64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20486990

Change-Id: I0b200617a7d83c24845da112f7f21f8b4f426b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 03:17:05 +00:00
Pasty Chang
0b61859b64 Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev am: 3bde8a502e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20486990

Change-Id: I9c5eacac486ea9e9a19660876490c1e74adc3da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 02:42:04 +00:00
Pasty Chang
3bde8a502e Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev 2022-11-25 02:15:17 +00:00
Yanting Yang
afbf2430af Apply new metrics to make App info dialogs have their own unique id 
- Apply SettingsEnums.DIALOG_BASE_APP_INFO_ACTION
- Apply SettingsEnums.DIALOG_INSTANT_APP_INFO_ACTION

Bug: 260072013
Test: make build
Change-Id: Ie1daecbcb4e03802ca31219d570b8e9fa674f371
 2022-11-24 19:07:13 +00:00
Bonian Chen
7d507964e6 Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44 am: a0baef444d am: 5d2afa168a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406

Change-Id: Ib998f0407156c5f16aed4b0a977ec8f85e048560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 15:46:37 +00:00
SongFerngWang
eece0b0420 The page id SettingsEnums.DIALOG_PREFERRED_SIM_PICKER is duplicated 
Bug: 260072136
Test: build pass
Change-Id: I683c3227d3138dea8699d7dd5a130cb02b1ceff8
 2022-11-24 23:17:21 +08:00
Bonian Chen
5d2afa168a Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44 am: a0baef444d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406

Change-Id: I5f54b27ea703417acc13421fb4810df5b79a5cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 15:10:40 +00:00
Bonian Chen
a0baef444d Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406

Change-Id: I2f18c417aeae58959902c61946ebc44391445411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 14:42:02 +00:00
Bonian Chen
d1e0b46a44 Merge "[Settings] Enable ActivityResultLauncher for keyguard" 2022-11-24 14:25:17 +00:00
Arc Wang
d132199429 Add page id enum for storage settings 
- Add SettingsEnums.SETTINGS_STORAGE_CATEGORY_WORK

Bug: 260052338
Test: compilation
Change-Id: Ib3e30410c2e2f6367be8ac26cd63cdf16caef70e
 2022-11-24 14:27:04 +08:00