PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,090 Commits 1 Branch 0 Tags
cb50d56ca0eba40039fd7e3329cf84c6a588b56c
Commit Graph

124090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
33b6de4b50 [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: I2996adf1a93bf975ab6e3f9f4df2fb5d9ed53b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 18:32:07 +00:00
Bill Yi
4717bf9bc6 Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85 am: 436870a9f8 am: 78d96018c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133

Change-Id: I1ed2c77276523ea4e382e38145789f66f44ff138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 18:28:39 +00:00
Bill Yi
34e2204ccc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4 am: 7fc6abdfb9 -s ours am: c173d9de53 -s ours am: 3a1d44e582 -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: I7fcf3d15de053572850c791d1d69aa5f1a0576a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 18:27:33 +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
78d96018c9 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: I974e15599a60efda9a749d8c9bed165e9a302d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:50:59 +00:00
Bill Yi
3a1d44e582 [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: Ic726f49647ad0851937a3be3eabe33d5a8292083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:50:44 +00:00
Bill Yi
a5a2ecc427 Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85 am: 436870a9f8 am: dc6f992c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133

Change-Id: I47d8ed8eea08fa99e83f58e4e71228334e0f843c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:16:30 +00:00
Bill Yi
8cad565391 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4 am: 7fc6abdfb9 -s ours am: c173d9de53 -s ours am: 2079f856fa -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: I97174997804afb86b90195f1017189bac5441ec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:16:16 +00:00
Automerger Merge Worker
23e4fae305 Merge "Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 am: 8a31106496 am: 6fbfec99c8 am: 06a58409b5" 2023-04-20 17:15:07 +00:00
Diya Bera
722e1d745f Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 am: 8a31106496 am: 6fbfec99c8 am: 7d251f4c51 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

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

Change-Id: Icd5406a60f4b9689d76205cc01ce3666fa118e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:14:16 +00:00
Automerger Merge Worker
dfb1496214 Merge changes from topic "am-4764bdd7e6604b13b44b80506b21bf10" 
* changes:
  Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b4d am: 23dd8c5b22
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d am: dc1e24b89e -s ours am: 07fbea7627 -s ours
 2023-04-20 17:11:35 +00:00
Bill Yi
5c03d71326 Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b4d am: 23dd8c5b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128

Change-Id: I3c58dbfe03352dafa6609d5b7115f3d1aac7b33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:10:26 +00:00
Bill Yi
8444b3ab68 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d am: dc1e24b89e -s ours am: 07fbea7627 -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: Ib5dea291ee8dd20ee2c38a194ef16f97d9fe6913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:10:23 +00:00
Bill Yi
dedf716062 Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b4d am: 4f7dc016bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128

Change-Id: I666e766bd6a88435d2460c12f73b2b21f39771f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:09:21 +00:00
Bill Yi
43172b6efe [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d am: dc1e24b89e -s ours am: de86fc18b4 -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: Ifc05d8a5f8976987bc4adf96d4642baad46ce4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:09:17 +00:00
Diya Bera
7d251f4c51 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: I92078b6f886ed54b98bd3a6d599f4acff6a5be1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:00:55 +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
23dd8c5b22 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: I15a16907ba83d1e459f2a73c5363d831186dfc4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:56:56 +00:00
Bill Yi
07fbea7627 [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: I719377fc2b61fd3f8d847dd75ed2a8d8777c6892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:56:47 +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
Piotr Wilczyński
bb755ef527 Merge "Back up the smooth display setting" into udc-d1-dev am: 2160faafb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724662

Change-Id: I55c28341ec31ccd1a9265a9903048464d27eb859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 14:01:37 +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
Bill Yi
c205fe957a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -s ours am: 3e8d5a6747 -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: I8afd73501167ef8dd7c6ed3c01dc66a2dfc678cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 19:46:09 +00:00
Julia Tuttle
8af4cf48ea Merge "Clarify full screen intent permission text" into udc-dev 2023-04-19 19:00:37 +00:00
Bill Yi
3e8d5a6747 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -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: I54ba4dacd8d625dde04b8fcf72ac7131b6d498f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:44:39 +00:00
Bill Yi
34a76b5ade [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570 -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: I8708ea492ca3c6534ff43d95fae2379304c79a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:25:57 +00:00
Becca Hughes
91f150ff75 Merge "Live update cred man settings" 2023-04-19 18:25:47 +00:00
Bill Yi
436870a9f8 Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133

Change-Id: I18e3868170489566921fc1d8cfed9b135739831e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:19:06 +00:00
Bill Yi
c173d9de53 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4 am: 7fc6abdfb9 -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: Idf57fa8698bf03665f9588a3182729cff63192c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:18:23 +00:00
Bill Yi
7d7a461c85 Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-19 17:59:19 +00:00
Bill Yi
367bedb886 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-19 17:59:16 +00:00