Christian Göllner
b613cc4a17
SettingsRoboTests: fix device state rotation related tests
...
Fixes: 280015539
Test: atest SettingsRoboTests
Change-Id: I0a3cc713f8df0477a172665a60551b456691b17c
2023-04-28 15:26:32 +02:00
Chaohui Wang
165777a935
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
am: b60bb6a22f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I9ab9b70f9992ee4911d3e129def2e3e09a75ee4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 13:19:09 +00:00
Chaohui Wang
a6d606f278
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
am: 6d591f5b5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: Id9c80b73953e39623dbf9ee2bdc4a670c0eb5d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 13:13:31 +00:00
Edgar Wang
f411b62425
Fix PrivateDnsPreferenceControllerTest test case failed
...
- getAvailibilityStatus_availableByDefault()
Fixes: 280048011
Test: locoal robotest
Change-Id: I490dc3348af241a76767885b52238d0b87880532
2023-04-28 21:04:59 +08:00
Chaohui Wang
6d591f5b5c
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I162a3dd40f6cda7ccbcef87703b1c5c76843f4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 12:30:19 +00:00
Chaohui Wang
b60bb6a22f
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I62662e92f9b302be44eaebe34dc1415924a900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 12:26:45 +00:00
Chaohui Wang
fec25d4bad
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev
2023-04-28 11:52:50 +00:00
Automerger Merge Worker
61f7877e19
Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
-s ours am: 028c16242d
-s ours
[automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c
-s ours am: 2471b9f543
-s ours
2023-04-28 10:38:39 +00:00
Treehugger Robot
fce49d2554
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
-s ours am: 028c16242d
-s ours
...
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I7a82893233c15bfefb534b67c56a46372f5b1d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:38:19 +00:00
Piotr Wilczyński
35145dabf3
[automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c
-s ours am: 2471b9f543
-s ours
...
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Ia1f40ff21d90bb417811cca1235bb4ce1b932367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:38:17 +00:00
Treehugger Robot
2ef3192c57
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
am: 7c369b3dbc
-s ours
...
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I50486bc710b63e92ec88b4342ec676e3ffd2e9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:37:53 +00:00
Treehugger Robot
028c16242d
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
-s ours
...
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I00d026fd81ea149d062d0e2f363225b72669e6fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:11:33 +00:00
Treehugger Robot
7c369b3dbc
Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Ic79aff153dc19207fb52fc73ec8f563cf79ff26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:11:26 +00:00
Piotr Wilczyński
2471b9f543
[automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c
-s ours
...
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Id89bf2cffbf4544399992568a1997df4e1ce5f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:10:39 +00:00
Treehugger Robot
060a56468d
Merge "Revert "Back up the smooth display setting"" into udc-dev
2023-04-28 09:58:16 +00:00
Chaohui Wang
8470122ad1
Fix ImeiInfoPreferenceControllerTest
...
For test case updatePreference_simSlotWithoutSim_notSetEnabled,
mSecondSimPreference is a mock, instead of check the default value of
isEnabled(), verify it's setEnabled() not called.
Fix: 279880808
Test: RobolectricTest
Change-Id: I72064820754e053def46bdbf10317189c7ac608f
2023-04-28 15:53:44 +08:00
Edgar Wang
42fa852018
Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8
am: ceafa204a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012
Change-Id: I378844e1eb8439713b61a5a65539426f9dfc568c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 06:57:25 +00:00
Edgar Wang
4637c3fd95
Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8
am: 386b3b662b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012
Change-Id: I84910f3c449ecc8e1d3805e414654c492f0c2249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 06:52:48 +00:00
Edgar Wang
386b3b662b
Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012
Change-Id: I94a6521cf1967c028faa657228cc909f2b1b3895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 06:09:16 +00:00
Edgar Wang
ceafa204a8
Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012
Change-Id: I14c6cbe94ee86eec033771a8f49bb82972e43a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 06:04:51 +00:00
Edgar Wang
8155b72cf8
Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev
2023-04-28 05:28:14 +00:00
Zaiyue Xue
8a6b100371
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
am: c6d11de87e
-s ours am: 75b3fc3f8c
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I9cbc4e633fcc37d3bd75e41e3665f13edf0d1c05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:20:19 +00:00
Zaiyue Xue
c95d995adc
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours am: 18d5ebc38f
-s ours am: 89323d4bc9
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I376482bc29f7c40b363e1ba63e14e4b605cde1a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:17:26 +00:00
Zaiyue Xue
cbab6ee3ed
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours am: 27c242f01d
-s ours am: 72f7b61a84
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I23e48165592ee2f5a3d8f8cedc0d87769e8c6ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:14:11 +00:00
Automerger Merge Worker
a48d96e698
Merge changes from topic "am-611eed0754b144ed92d14b3e518d54f2" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours am: 18d5ebc38f
-s ours am: 283bea4dd0
-s ours
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours am: 27c242f01d
-s ours am: 92c94ed6e9
-s ours
2023-04-28 04:13:37 +00:00
Zaiyue Xue
68296e698a
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours am: 18d5ebc38f
-s ours am: 283bea4dd0
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I919996984aa47723ccbf9ee47bd116925274fe5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:12:00 +00:00
Tom Hsu
93edf2edd1
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
am: 574483e474
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: I724fd9f9f18c65c67a354e703e59a7d0dd602a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:10:24 +00:00
Zaiyue Xue
75b3fc3f8c
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
am: c6d11de87e
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: Id8d7d85db67c593b7ebf7c6c617b0a8123633133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:09:44 +00:00
Zaiyue Xue
bd130156a3
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours am: 27c242f01d
-s ours am: 92c94ed6e9
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I20395f5108482bbc7b06f13dc5a3e9be13a7e44c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:09:36 +00:00
Tom Hsu
1e2ecf3e2e
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
am: 39b150171b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: Id2f4e945fc893315f15f4f58e0f114187b5edb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:06:24 +00:00
Bill Yi
faf6409455
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Bug: 278022447
Change-Id: I865cc944ab660f47b40b48af32a7aef389551963
2023-04-28 03:55:42 +00:00
Bill Yi
547484f797
Import translations. DO NOT MERGE ANYWHERE
...
BUG:278022447
Auto-generated-cl: translation import
Change-Id: I746cb0e511ad3e9a19f2dfb0d152319e53c7a11f
2023-04-27 20:47:48 -07:00
Zaiyue Xue
89323d4bc9
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours am: 18d5ebc38f
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: If994cd71458c874a2a2041c201960b1b8cd2d8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:43:49 +00:00
Zaiyue Xue
72f7b61a84
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours am: 27c242f01d
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I3a39b7fcfbfce0c7b909e16a1275842bcafa5b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:43:03 +00:00
Zaiyue Xue
283bea4dd0
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours am: 18d5ebc38f
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I798960082e851991561c9a836592df2111cd1ad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:25:10 +00:00
Zaiyue Xue
92c94ed6e9
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours am: 27c242f01d
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I15144b4f05a33aafdc609d3e02654e5f34b752e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:24:58 +00:00
Tom Hsu
39b150171b
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: I49425eb7c992008e5dc7f0d028c82e4bee41038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:23:39 +00:00
Zaiyue Xue
18d5ebc38f
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I3cd68b222aa83eada95698d381880433c57b9fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:20:10 +00:00
Zaiyue Xue
27c242f01d
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: Ic1b0667493cbf0009c71c2ea0cd67ef708d73698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:20:02 +00:00
Zaiyue Xue
c6d11de87e
Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I4cb41677f4c7bd55cd92440e6a0e59a8d3a878eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:18:27 +00:00
Tom Hsu
574483e474
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: I3e1823e82cc1d0a2cdc57652b8de7cbddd3bb2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:17:19 +00:00
Tom Hsu
bd9263b391
Merge "[Settings] UI part: Add metrics for language" into udc-dev
2023-04-28 02:49:59 +00:00
Zaiyue Xue
6aba166376
Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev
2023-04-28 02:43:00 +00:00
Bill Yi
75997c0291
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia77f9d73eb09f3b732bb573c285f0a708bdc6d48
2023-04-27 15:15:59 -07:00
Bill Yi
4aaf3c69d2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id35f9662e9184f7c027ed947fc025da452f5f5de
2023-04-27 15:00:42 -07:00
Bill Yi
af0651b602
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie83d53a350c848bb4cf4aaa63ec18470332526db
2023-04-27 14:52:34 -07:00
Julia Tuttle
16015f0dfd
Merge "Update FSI permission strings" into udc-dev am: 2094622da9
am: e2a8133da4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255
Change-Id: I717e48fdec86ba3e1feb06ad3dea2b100a86cf1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 21:36:37 +00:00
Julia Tuttle
03b06d6ff1
Merge "Update FSI permission strings" into udc-dev am: 2094622da9
am: 4792f21e3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255
Change-Id: Ic23004d25860bc1e7809587307131695c39665f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 21:33:43 +00:00
Julia Tuttle
3a68e5bf28
Optimize imports in AppNotificationSettings
...
Bug: 277938609
Test: builds
Change-Id: Id44390f6fc8b6294c951a7f4ec9bd37e0a364dfd
2023-04-27 17:24:14 -04:00
Julia Tuttle
e2a8133da4
Merge "Update FSI permission strings" into udc-dev am: 2094622da9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255
Change-Id: Ib07fb63100747c1486f3d0cdf9c80549be65a028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 20:49:23 +00:00