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

124956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6be82a5ee6 Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I71d802cf9ec3e3e686ed380f2b6d85271e0d964c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 12:31:03 +00: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
2dcc5233b1 Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into udc-d1-dev-plus-aosp am: 61f7877e19 -s ours 
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 eef23f441c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948

Change-Id: I8834cc3d3c15154ae0d47333311f7fdf94d51cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 11:30:56 +00:00
Treehugger Robot
8620f861f2 [automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d -s ours am: 028c16242d -s ours am: fce49d2554 -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: Ia26a18b0887b2432532070c3073eb31d95047b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 11:30:53 +00:00
Treehugger Robot
0d423db650 [automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d am: 7c369b3dbc -s ours am: 2ef3192c57 -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: Id7671e023bf00786057f3ceb7b88fecb74d41b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 11:25:55 +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
78e2416dc4 [automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d am: ea1046bee7 -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: I2cbcbc4870537da929fdf4ee41254b6b16da7b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 10:35:35 +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
Treehugger Robot
ea1046bee7 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: Ie6244b8bdbc1a328bb72d359e88b581949d66809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 10:10:56 +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
Edgar Wang
4a07391ac7 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 am: ceafa204a8 am: 42fa852018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I6f8061b630ce504834b6c23ab3d13ddfb28fcd04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 09:07:41 +00:00
Edgar Wang
b31c5604c3 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 am: 386b3b662b am: 4637c3fd95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I768738946b48ac2774923ca522e8b94fea441e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 09:04:43 +00:00
Zaiyue Xue
2bcd804c2e [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: 8a6b100371 -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: I46eb6d706163b963c2b6da6fcf07d40280e77dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 08:58:16 +00:00
Zaiyue Xue
5360bff5b9 [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: c95d995adc -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: If44b5983536cfb71787fd6d53c8fab166ccd5e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 08:42:55 +00:00
Zaiyue Xue
62d2f06b89 [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: cbab6ee3ed -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: I90d705290fe0ac8fcf273768425b1a237aafc3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 08:42:04 +00:00
Automerger Merge Worker
06d4b72043 Merge changes from topic "am-611eed0754b144ed92d14b3e518d54f2" into udc-d1-dev-plus-aosp am: a48d96e698 -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: Iefc55470289139e56f09730ee2172af0eba83184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 08:15:55 +00:00
Zaiyue Xue
9337673116 [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: 68296e698a -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: I6868a8c25726f9730c8d2e1d552ad25c35957139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 08:15:48 +00:00
Automerger Merge Worker
d79752a987 Merge "Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 574483e474 am: 93edf2edd1" 2023-04-28 08:05:55 +00:00
Treehugger Robot
186b9ef5b5 Merge "[BiometricsV2] Fix fingerprint 2nd enroll fail" 2023-04-28 08:05:45 +00:00
Tom Hsu
2f1428de1a Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 574483e474 am: 93edf2edd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I46e3fe68930adf95eb3aa514d0627c8fd9959922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 08:05:38 +00:00
Tom Hsu
0629a8cedd Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 39b150171b am: 1e2ecf3e2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I0b103c9420eeaed2e1747281e513527a370c8eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 08:00:04 +00:00
Julia Tuttle
008dd9fec5 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: e2a8133da4 am: 16015f0dfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ib59598771a395086068a695193e03c5a1d3b1536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 07:59:49 +00:00
Julia Tuttle
d7f708f152 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: 4792f21e3d am: 03b06d6ff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I5f0ff0d8d88430c2cbc67afd03fe0698b6068edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 07:57:42 +00:00
TreeHugger Robot
47eb14361a Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: d4ceb73fe5 am: 4896c53060 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I44ea0adf4cb1bb187d2df8c4d1f521986c0b061f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 07:56:04 +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
TreeHugger Robot
f3b6e920c4 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: 9e2e3e9ae6 am: f48a328ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I1f41f2a2b405626aa1445bafdd34bbfba7b077d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 07:47:42 +00: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
d6ebd9536b Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 am: 2d4d23ecb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I9424a29754daf09057eef3e516c813dff88aca94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:52:50 +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
2d4d23ecb3 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: I2060622fa99166cf0190bca4d41da7f255a8f337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:09:19 +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
Treehugger Robot
9ed2ac48fb Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924 am: 0469be62f0 am: 82296631cd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I81730fe484cd19aec2a97e43f2f4d7e57ec4672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 05:53:26 +00:00
Edgar Wang
8155b72cf8 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev 2023-04-28 05:28:14 +00:00
Treehugger Robot
f500b7a7fc Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b am: 83f2d27e35 am: 97c42d8736 am: e207694022 am: 7a86020bd8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510

Change-Id: I9e1d6d1fc05887802bdc39b87e1a075ed33b0c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:55:06 +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