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
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
Bill Yi
264e2d8633
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-s ours am: 2c5359dd0b
-s ours am: be82b851f0
-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: Ibbe80e0add50810a5a8c0c682d1fbc786825074e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 10:07:56 +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
4fa5714cba
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-s ours am: 2c5359dd0b
-s ours am: 9a1fd05459
-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: If01ae312c6596a5a0267b3c09c62d84a97cc8722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:26:31 +00:00
YK Hung
c93a0c662d
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff
am: 0a8bd0698e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011
Change-Id: I6246c85933188de62abcf5be1fcd18acb5caa6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:07:44 +00:00
Bill Yi
be82b851f0
[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: I23a3c024aa1b9761bb917cc22ef6dccb9562285c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:06:44 +00: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
YK Hung
f90193c381
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff
am: ed340caca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011
Change-Id: I100c1d49ec14d2d7e43b273a01546a67bd994801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:05:07 +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
Bill Yi
2c5359dd0b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-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: I96be7c465959b1301eb2ca154f8cc93369685d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 08:25:57 +00:00
YK Hung
ed340caca8
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011
Change-Id: I796a2b706fbce2331ace9388e63244135ddefc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 08:21:33 +00:00
YK Hung
0a8bd0698e
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011
Change-Id: I9fd2dbec190fab48bc9a62ff8f1ac8a8b32437d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 08:19:43 +00:00
YK Hung
3f9363aaff
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev
2023-04-19 07:40:45 +00:00
Zoey Chen
acfbf6899b
Merge "[Settings] Remove the large space when searching language" into udc-dev am: 5614c1e7dc
am: 84a7e78630
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22713802
Change-Id: I031dd4bbc163f2c46c194357520c0a373b0114b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:51:29 +00:00
Zoey Chen
98082c8ad2
Merge "[Settings] Remove the large space when searching language" into udc-dev am: 5614c1e7dc
am: 446909b4da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22713802
Change-Id: I55ee03379a7526c15c971ed75fba6d6c5ffb2358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:47:28 +00:00
Automerger Merge Worker
eafb5594fe
Merge changes from topic "am-3324be7194124a63b43a64e9b5596abe"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb
-s ours am: 956f1001fb
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d
-s ours am: f99e320351
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed
-s ours am: e8971c92c5
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf
-s ours am: 825c3da34d
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e
-s ours am: b1a3ff1600
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e
-s ours am: 4cd3e99f74
-s ours
2023-04-19 06:45:30 +00:00
Bill Yi
5f5bbed59b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb
-s ours am: 956f1001fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I34d00cfb2c7bed7f46f7e8e93b3dc80d60483834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:20 +00:00
Bill Yi
7d3b1ec887
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d
-s ours am: f99e320351
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I2ef85c608abe4b09a6bf70414ec86a56cf13b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:13 +00:00
Bill Yi
8d4bb55f4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb
-s ours am: a3d465081c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I547f7d944e304d284238f306a080464c63fde8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:05 +00:00
Bill Yi
fab2ce4721
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed
-s ours am: e8971c92c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I4b9d727aba15a389e5fe2948b5d6ea83e337dfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:03 +00:00
Bill Yi
7c4b335598
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d
-s ours am: 1ab0953e8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: If4d8a02a252f4dd516e175b4acb8cbf986fa0a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:58 +00:00
Bill Yi
bc8a415353
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf
-s ours am: 825c3da34d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I2327a926433591ac38c45d1c3fb776d4fe6ff15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:48 +00:00
Bill Yi
949ca50d5c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed
-s ours am: bc5e8d9f68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: Ib5ca4452cf330169d6dc4eadf53a2e41c7208b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:48 +00:00
Bill Yi
a11e1c2328
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf
-s ours am: 59c2d1b5ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: Ib3ecbb54a3acfed71c207282ed905935c5ab0964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:38 +00:00
Bill Yi
88df82c60a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e
-s ours am: b1a3ff1600
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I0a4b8c006449d3448e22f93e1f5d4c14030fc950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:31 +00:00
Bill Yi
de62eea80b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e
-s ours am: d0a2e9fe6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: Ic076a9c1ffe086a6afd0fb5ddccf673197a5efea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:17 +00:00