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

124422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Becca Hughes
e132adfc3b Update string based on new mocks 
Test: ondevice
Bug: 278919696
Change-Id: I66ca5ea5b416fc4f3bbcab42f5215f5a499f8b60
 2023-04-19 21:33:24 +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
Diya Bera
6fbfec99c8 Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 am: 8a31106496 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ie1505f0272340b867648341bfe01f26e948f14b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:54:50 +00:00
Bill Yi
1f91a234bc Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-19 17:53:31 +00:00
Bill Yi
7be59916a3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-19 17:53:31 +00:00
Bill Yi
98a81a1f2e Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-19 17:53:31 +00:00
Bill Yi
b660ca5570 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-19 17:44:26 +00:00
Bill Yi
ddff8a4b4d Merge changes from topic "tc_change_23041807_28" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-19 17:44:25 +00:00
Diya Bera
8a31106496 Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ibfc5a6684f98c842f95f5cb125310d89a0035644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:39:42 +00:00
Diya Bera
49ea4e5d22 Merge "Adding owners" am: b1aabec0db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ib03f9e473201e6a826cb7810e32b00ad1e3da965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:11:26 +00:00
Diya Bera
b1aabec0db Merge "Adding owners" 2023-04-19 16:30:18 +00:00
Becca Hughes
7039cdb12a 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 16:19:28 +00:00
Automerger Merge Worker
a512c4ce80 Merge "Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe am: bb2fc30381" 2023-04-19 14:29:47 +00:00
Pavel Grafov
850c99060c Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe am: bb2fc30381 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645501

Change-Id: I618cf57fc85f9ad859c7f69a33d2c13803b47be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 14:28:58 +00:00
Pavel Grafov
542b0fd031 Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe am: ccda5d60ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645501

Change-Id: I9859fa1d5dc8ee2880a4a4363c1819dfe48ec4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 14:28:49 +00:00
Pavel Grafov
bb2fc30381 Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645501

Change-Id: I0049956a36017b0de9c7c27bd1aeaec64923f13a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 13:30:47 +00:00
Pavel Grafov
ccda5d60ce Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645501

Change-Id: Id786ede3ec04b280493ef6a12822ad225b45c1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 13:29:42 +00:00
Pavel Grafov
b8d639c8fe Merge "Fix uninstall button can't click problem" into udc-dev 2023-04-19 12:50:27 +00:00
Philip Junker
ded7f45e6a List apps which requested the TURN_SCREEN_ON appOp permission 
This reverts commit 94f08e4ba1.
Reason for revert: Re-land with fix (b/278739832#comment8)

Bug: 272053372
Change-Id: I945e543b6e17b682bc88e9e9b0a79775a71dd6f7
Test: manually installed an app which requests the permission and verified it shows up correctly in Settings > Apps > special app access > Turn screen on
Test: atest AppFilterRegistryTest
Test: atest TurnScreenOnDetailsTest
Test: m -j RunSettingsRoboTests
Test: adb shell am start -a android.settings.TURN_SCREEN_ON_SETTINGS
 2023-04-19 11:59:19 +00:00
Piotr Wilczyński
af320436fb 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
 2023-04-19 11:35:08 +00:00