Bill Yi
1fca37e570
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570
-s ours am: 34a76b5ade
-s ours am: e69c91f7e4
-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: I85cd93c940465a1e3bc6d5e460ca505656d92b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:14:56 +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
Bill Yi
01f2ef7c6a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570
-s ours am: 34a76b5ade
-s ours am: 33b6de4b50
-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: I1a41d116fc9e9cbb4fca4313834ce44f34025a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 18:39:19 +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
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
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
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
Piotr Wilczyński
2160faafb4
Merge "Back up the smooth display setting" into udc-d1-dev
2023-04-20 13:25:07 +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
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