PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,998 Commits 1 Branch 0 Tags
a9e09ac0ce24d5c9ab8de4f9b87aa56ae07a068f
Commit Graph

121998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Junker
a9e09ac0ce Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I7edb0846e9d07ad966fdb3753d02481d4b959cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 10:20:25 +00:00
Philip Junker
134bea1957 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev 2023-04-21 10:07:47 +00:00
Bill Lin
73b4163534 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I99ec5143d6367180b2a33262b50b07724dbacc6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:13:02 +00:00
Piotr Wilczyński
1fc920d0cf [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours 
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: Id32d9d31e5776e0d88c76ccde881fa337b1ad283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:56:31 +00:00
Piotr Wilczyński
157fe7c4b7 [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours 
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: I7b3e7d7d1d4096680a38656f18e29e2d86e83036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:56:28 +00:00
Bill Lin
a958fc79c8 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev 2023-04-21 07:35:55 +00:00
Piotr Wilczyński
85d5e3efb8 Merge "Back up the smooth display setting" into udc-dev 2023-04-21 07:31:47 +00:00
Treehugger Robot
4334ccb662 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: Ib98306fe33abe1520124309d84c13580e0c57a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 06:28:02 +00:00
Treehugger Robot
0c1838807d Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev 2023-04-21 05:57:43 +00:00
TreeHugger Robot
e7a1f12ea0 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: Iae6ef0f7100dde1b24cffbb2fc447fec14597f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 05:05:11 +00:00
TreeHugger Robot
06a4e06291 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev 2023-04-21 04:28:19 +00:00
Zaiyue Xue
74d8a4b745 Fix BatteryChartPreferenceControllerTest Fail 
Bug: 279107937
Fix: 279107937
Test: presubmit
Change-Id: Ie5597361e4c3c90737b8dcfc302fc3aad94ea476
 2023-04-21 11:12:14 +08:00
lbill
8e12f5257d Add Null check FingerprintSettings#updateAddPreference() 
When fingerprint finish enrollment, user click Done
The flow would be:
-> wm_finish_activity
-> relaunch_resume_activity
-> wm_on_destroy_called
-> wm_on_create_called
-> wm_on_start_called
-> wm_on_activity_result_called
   In U, we need to add NPE check when updateAddPreference()
   earlier then addFingerprintItemPreferences()
-> wm_on_resume_called

Bug: 275519315
Test: manual enroll SFPS, in FingerprintEnrollEnrolling,
      rotate device, then complete the enrollment
      verify the flow never crash and user can see enrolled
      fingerprint in FingerprintSettings

Change-Id: Ia262741aeceeb36eefd159ad2ca1c9fa0e061d54
 2023-04-21 02:24:43 +00:00
Yuxin Hu
77b9ebf525 Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: I61ce5d1606e66479820abf0a15efc390dba80cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:20:18 +00:00
Tetiana Meronyk
be328cb743 Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756

Change-Id: I9ea8083d6b24522f8771977a15d4e06d3059d204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:15:02 +00:00
Ken Lin
947f9f2553 Merge "Smooth Display description error" into udc-dev am: 24a5a1c824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748

Change-Id: Ia06e9e7f22400e884bd3effdb6995564f2b116df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:54 +00:00
Elliot Sisteron
18fd113737 Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062

Change-Id: I937ff5894ffb7f000824044981cedc3b2eb63080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:44 +00:00
Treehugger Robot
72823d814d Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: Ib73a0321690d7b5f62125052b40497a0c4dbadbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:34 +00:00
Treehugger Robot
36ed86a6c5 Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: Ifa36325db77fe06b13ec95310b07b2df03d4ce29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:17 +00:00
ykhung
89573cd826 Update battery tip main icon into materiel theme design am: ff65a02ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: I29e3e2aeff9595443fbb83be7ef7a2f95a4aa475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:08 +00:00
Karishma Vakil
9ae6caac07 Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283

Change-Id: Id06452bb09dd23cbaa2e6803ec92c0cb293a7f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:01 +00:00
Chaohui Wang
7d063294d8 Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782

Change-Id: Ib03b3040068455718a580b59d288390e0ef4d37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:52 +00:00
TreeHugger Robot
63b579aa52 Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561

Change-Id: I3fea57afdfaafdfe7a96fa82c28c86c4f68a91ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:43 +00:00
TreeHugger Robot
0b2f7c967a Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244

Change-Id: I27756cc3637a0e3a841e9a07303685e774b3f350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:33 +00:00
Becca Hughes
5f5c6ed682 DO NOT MERGE Live update cred man settings am: d8b74b5c39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746581

Change-Id: I30fa4a6571c425085144a6b78362c15ac51745c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:23 +00:00
Bill Yi
36502b6afe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -s ours am: 3e8d5a6747 -s ours am: c205fe957a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia797c4eca1ad0591509d48c3e892da86dd5f37a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:10:29 +00:00
Julia Tuttle
e81af0ad4e Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610

Change-Id: Ib434b5e4190dd486f7bf55378bc14950c6132dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 19:57:38 +00:00
Bill Yi
e69c91f7e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570 -s ours am: 34a76b5ade -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ec5126d97ac337e1c7f59c1f65ce211ca12d589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 19:42:53 +00:00
Yuxin Hu
76e769cdb0 Merge "Add permission to use GPU service APIs" into udc-dev 2023-04-20 18:05:47 +00:00
Bill Yi
dc6f992c92 Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85 am: 436870a9f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133

Change-Id: I2aca004596e6269d472b572a195366d374041850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:00:18 +00:00
Bill Yi
2079f856fa [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4 am: 7fc6abdfb9 -s ours am: c173d9de53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If245d64ee814f43d70e645098738d9eaf3a0d467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:00:03 +00:00
Diya Bera
06a58409b5 Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 am: 8a31106496 am: 6fbfec99c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Id79d4e7f1b40509ec145627a86a892d4b3d68d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:59:02 +00:00
Bill Yi
4f7dc016bc Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128

Change-Id: I8e49a528c978f01a04dd990e46b9ab7526c2eb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:54:52 +00:00
Bill Yi
de86fc18b4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d am: dc1e24b89e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifdeea72838e3264d3bf8814ab4ae24863e7d35ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:54:43 +00:00
Tetiana Meronyk
84da171439 Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev 2023-04-20 15:12:57 +00:00
Ken Lin
24a5a1c824 Merge "Smooth Display description error" into udc-dev 2023-04-20 14:00:53 +00:00
Piotr Wilczyński
5c42659602 Back up the smooth display setting 
- Convert "Smooth display" and "Force peak refresh rate" to a boolean. If they are a boolean, they can be backed up without being device-specific.
- Back up "Smooth display" and add a validator
- Upgrade the settings in SettingsProvider
- Create a utils class - RefreshRateSettingsUtils

Bug: 211737588
Test: atest DisplayModeDirectorTest
Test: atest ForcePeakRefreshRatePreferenceControllerTest
Test: atest PeakRefreshRatePreferenceControllerTest
Test: atest SettingsBackupTest
Test: atest SettingsProviderTest
Change-Id: Ib2cb2dd100f06f5452083b7606109a486e795a0e
Merged-In: Ib2cb2dd100f06f5452083b7606109a486e795a0e
 2023-04-20 13:25:38 +00:00
Piotr Wilczyński
2160faafb4 Merge "Back up the smooth display setting" into udc-d1-dev 2023-04-20 13:25:07 +00:00
Elliot Sisteron
0a506448b8 Merge "Launch work profile entries intent in the profile parent." into udc-dev 2023-04-20 12:19:33 +00:00
Treehugger Robot
8609ef2291 Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev 2023-04-20 11:29:47 +00:00
Zoey Chen
4d0d06fcfe [Settings] Dialog does not show full msg and title in landscape mode 
Add scroll bar and fix the text's style

Bug: 278831022
Test: manual local test
Change-Id: Ic0ad0c097099181f92535dba247d0c646904b7c7
 2023-04-20 11:04:06 +00:00
Treehugger Robot
bc67d885ec Merge "Update the proper App battery usage string on App info page" into udc-dev 2023-04-20 10:50:46 +00:00
Zaiyue Xue
0aee0e6aa0 Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..." 
mock: https://screenshot.googleplex.com/C8ZbSL6UfJ9jRJx.png
screenshot: https://screenshot.googleplex.com/4nqRv3UA2iGoQuK.png

Bug: 278986376
Fix: 278986376
Test: manual
Change-Id: Iccb67c3695b21b62d5d26a96a791ca46a1ba7e0a
 2023-04-20 17:49:49 +08:00
ykhung
ff65a02ff8 Update battery tip main icon into materiel theme design 
Update all battery tip icon into materiel theme design based on the UX
feedback and clean up legacy icons

Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I82f5b140700a36b29844c0c3330b2eeeda8e5a55
 2023-04-20 09:19:36 +00:00
Karishma Vakil
85e5174132 Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev 2023-04-20 04:04:19 +00:00
Chaohui Wang
ac2dc8dd01 Merge "Fix button label missing in the SIM card pop ups" into udc-dev 2023-04-20 03:39:23 +00:00
TreeHugger Robot
d21225790b Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev 2023-04-20 03:34:29 +00:00
TreeHugger Robot
fb52240afe Merge "Fix RTL display problem in Open by default" into udc-dev 2023-04-20 01:59:00 +00:00
Karishma Vakil
151d3deed2 [Safety Labels] Enable safety label change notifications flag by default 
in Settings code

Bug: 261249312
Test: atest CtsPermission3TestCases
Test: atest AppDataSharingUpdatesPreferenceControllerTest
Change-Id: I34da5e4d140731b00749c89f8b328a2f2cb93e61
 2023-04-19 23:50:57 +00:00
Becca Hughes
d8b74b5c39 DO NOT MERGE Live update cred man settings 
This CL will enable live update of credential
providers if any are added/removed.

Test: atest
Bug: 264420106
Change-Id: I14804bac17a4efe5eccd3c5824558eace18da186
 2023-04-19 22:06:15 +00:00