Chaohui Wang
95cb923575
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: I9dad3f09aa72baa927e6825f263f86cd35098a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:07 +00:00
TreeHugger Robot
87d7e0f59a
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: I0e19f735e70359c892d89bbaa35fe4da4ca55e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:55 +00:00
TreeHugger Robot
168534ecb4
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: I18094e0de30ce9b605c0c2c0f8a36b28ddef4fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:40 +00:00
Becca Hughes
6dbc9554da
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: Iba0353004c19f07c7a4c2fe2df76dbbc5575a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:25 +00:00
Bill Yi
c95d152465
[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: Ief00d248c5dfb27e44d8027f081bb3c9293a2436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:07 +00:00
Julia Tuttle
57b70c2c01
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: I11dc017536371d527f618eddeea8731722574ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 19:45:53 +00:00
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
Austin Delgado
0ea56b4fec
Hide enrollment options that don't match requested biometric strength
...
When calling biometric enroll intent with biometric_strong, don't include
weak enrollments as options.
Bug: 265898482
Test: Tested manually by calling enrollment and verifying correct
options are shown
Test: atest BiometricEnrollActivityTest
Change-Id: I5fa650a593aee536955ae806f5963ffbdc135a2e
2023-04-20 11:20:37 -07: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
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
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
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
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
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
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
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
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
Milton Wu
3024352f85
[BiometricsV2] Fix fingerprint add another fail
...
Fix enrolling can't finished because FingerprintEnrollment attaches to
wrong ViewModel during onCreate() with non-null savedInstance after
rotation.
Read latest fragment through findFragmentById to fix it
Bug: 275513362
Test: atest FingerprintEnrollmentActivityTest
Change-Id: Icb2c0edec325a813ec5a7822aba39ca201d2d8e9
2023-04-19 17:35:33 +08:00
Bill Yi
9a1fd05459
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-s ours am: 2c5359dd0b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696131
Change-Id: I08b025094e707efb65c47de4869b0e8e34e0f459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:06:29 +00:00
Yanting Yang
3be454f967
Update the proper App battery usage string on App info page
...
Bug: 278045681
Test: visual
Change-Id: I4da671615f11554e2cd64f3a801252df5c0ba6f4
2023-04-19 17:00:46 +08:00