PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,885 Commits 1 Branch 0 Tags
a57a41c0db2e833fa178937b4ab25c908a99ff3c
Commit Graph

110885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
a57a41c0db Merge "Clean up unused PreviewSeekBarPreferenceFragment" 2022-06-07 10:08:24 +00:00
Automerger Merge Worker
588d5db985 Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524" into tm-d1-dev-plus-aosp am: 2de1730ca0 am: 2a3e6630ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: Ida42fc01d7d170204177bb0e395665f66733a21b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 05:31:04 +00:00
Edgar Wang
dfe3692258 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 025baa318b am: 0d22bf453d am: 65d4e5ffef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: Ia96136f5c3f44b8ead75c8d7d2c0ba1d5a27f577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 05:30:56 +00:00
Edgar Wang
fe601c0489 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 am: 7ab5a44498 am: 94a7906033 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: Iaf9e24ca15aa94241c07db97c2b0d11881328e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 05:30:48 +00:00
Automerger Merge Worker
2a3e6630ae Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524" into tm-d1-dev-plus-aosp am: 2de1730ca0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I33d0be2302813faf76949efdc869cdcb0eb7c296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 05:12:42 +00:00
Edgar Wang
65d4e5ffef Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 025baa318b am: 0d22bf453d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I49d34f1b2f737217216096f0fbd9c6d6d46afb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 05:12:33 +00:00
Edgar Wang
94a7906033 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 am: 7ab5a44498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I957fd8fde3ae1865148de0fdd7c6d32b9bb79217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 05:12:17 +00:00
Automerger Merge Worker
2de1730ca0 Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524" into tm-d1-dev-plus-aosp 2022-06-07 04:58:42 +00:00
Edgar Wang
0d22bf453d Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 025baa318b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I56e33ea1e76d0426f15816862464a81d36934848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:58:38 +00:00
Edgar Wang
f3883c5da8 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I264c15129aad5569e1d05e37940247c95ae4d07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:58:38 +00:00
Edgar Wang
7ab5a44498 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I3d2bdadb80d2a1189e8e7e69d883ac2f4763bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:58:36 +00:00
Edgar Wang
160d3af916 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: e7d6508284 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: If4f5d9eb91c4e5f74747ba391caba5ea7351cdd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:57:57 +00:00
Automerger Merge Worker
881d38ba42 Merge changes from topic "am-038a028ec25548ecafb51d7e14eb8cbf" into tm-qpr-dev-plus-aosp am: a1a0499242 -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 b51ae97810 is already in history

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

Change-Id: I0e841a8409bf01a73fa873487e2b3812bdf3f0f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:43:15 +00:00
TreeHugger Robot
53d5a5984b [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c -s ours am: 02dead7892 -s ours am: 572cfb7640 -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: I6d9fd10282d81fb3c775cc983cb9e3dc6be00030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:43:14 +00:00
TreeHugger Robot
4dfacddc1e [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c am: 303c6f3cac -s ours am: 40472f831f -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: I0463c0958548bfe7d161beabc574d71257f379e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:42:41 +00:00
Alice Kuo
d702cbb407 [automerger skipped] Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e am: b8b79e0574 -s ours am: 9dbce75768 -s ours 
am skip reason: Merged-In I2d650eb315790c3efc7510d9e125aeaf4464cda6 with SHA-1 b13abc03dd is already in history

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

Change-Id: Id3c8afa16dc095b47132a7faa97063ae92baf460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:42:39 +00:00
Alice Kuo
1c9b82fb21 [automerger skipped] Add LE Audio feature switcher in the developer option menu am: 948b7cb959 am: b045c57fe6 -s ours am: df44228ece -s ours 
am skip reason: Merged-In I8adcf27edd1438df445d32fca93f35ff5020a3b3 with SHA-1 0d11fd07e7 is already in history

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

Change-Id: Id08bbd58047719954b58ebde2a2a68d13863cde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:42:38 +00:00
Edgar Wang
47b4c86524 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I0f6f87246effdc808b77726a0519d4b063ef4fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:41:48 +00:00
Edgar Wang
e7d6508284 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I11312c2633242bf780379ff4b66a72800afde31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:40:42 +00:00
Edgar Wang
025baa318b Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I831063be158b5097e3cc82e8d5db767676096811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:40:14 +00:00
Edgar Wang
1f6334825f Merge "Recalculate view's height when tab is selected" into tm-dev 2022-06-07 04:17:39 +00:00
Automerger Merge Worker
a1a0499242 Merge changes from topic "am-038a028ec25548ecafb51d7e14eb8cbf" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c -s ours am: 02dead7892 -s ours
  [automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810 -s ours am: a6b2701416 -s ours
 2022-06-07 04:15:20 +00:00
TreeHugger Robot
572cfb7640 [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c -s ours am: 02dead7892 -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: I0b2c71b9fae7ed8417d0b696e41f80222d87f054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:15:15 +00:00
Alice Kuo
d9a4ef42cf [automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810 -s ours am: a6b2701416 -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: Ifaffa92a7a990552d068a8ba5dcc240fddf0e4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:15:14 +00:00
TreeHugger Robot
40472f831f [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c am: 303c6f3cac -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: Ic3f98ad45cbd9236e8287c0cf07cff507033a667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:15:11 +00:00
Alice Kuo
9dbce75768 [automerger skipped] Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e am: b8b79e0574 -s ours 
am skip reason: Merged-In I2d650eb315790c3efc7510d9e125aeaf4464cda6 with SHA-1 b13abc03dd is already in history

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

Change-Id: Ib3a8ffcbab86e98d96392d3ae5a48d9b6820bfcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:15:10 +00:00
Alice Kuo
df44228ece [automerger skipped] Add LE Audio feature switcher in the developer option menu am: 948b7cb959 am: b045c57fe6 -s ours 
am skip reason: Merged-In I8adcf27edd1438df445d32fca93f35ff5020a3b3 with SHA-1 0d11fd07e7 is already in history

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

Change-Id: Ia8ff483a5dee22c85d04ad3884f7ffc1699e1533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:15:08 +00:00
TreeHugger Robot
303c6f3cac Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333

Change-Id: I30105608cf552ec60582cb296179b9cd94b6d66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:00:25 +00:00
Alice Kuo
b8b79e0574 Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740332

Change-Id: I2200a81b0d63cc690b475e5eed43e6f3e9f49ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:00:24 +00:00
Alice Kuo
b045c57fe6 Add LE Audio feature switcher in the developer option menu am: 948b7cb959 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331

Change-Id: Ia0fa92a5061bdb75a648dbb3d8db9fd2bcbdb1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 04:00:22 +00:00
TreeHugger Robot
02dead7892 [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: If223945b3c668ab61fab6b15bbdf3ae171d41120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 03:59:02 +00:00
Alice Kuo
a6b2701416 [automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810 -s ours 
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: I2dc97c6056295200799541e7f3af964e915eaa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 03:59:00 +00:00
TreeHugger Robot
671c65235c Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev 
* changes:
  Grey out LE audio offload switcher as LE audio isn't enabled/supported
  Unify the LE audio string and refine the layout to put LE audio switch together
  Add LE Audio feature switcher in the developer option menu
 2022-06-07 03:37:21 +00:00
Menghan Li
d9f5550681 Merge "Setup ToggleColorInversionPreferenceFragment test infrastructure" 2022-06-07 03:21:15 +00:00
Menghan Li
76f7bae7db Merge "Setup ToggleDaltonizerPreferenceFragment test infrastructure" 2022-06-07 03:21:02 +00:00
Alice Kuo
b51ae97810 Grey out LE audio offload switcher as LE audio isn't enabled/supported 
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
Merged-In: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
(cherry picked from commit f71b2ea56e)
 2022-06-07 09:43:08 +08:00
Alice Kuo
ed1a79a97e Unify the LE audio string and refine the layout to put LE audio switch together 
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
Merged-In: I2d650eb315790c3efc7510d9e125aeaf4464cda6
(cherry picked from commit b13abc03dd)
 2022-06-07 09:39:25 +08:00
Alice Kuo
948b7cb959 Add LE Audio feature switcher in the developer option menu 
Add a switcher to enable/disable LE audio feature. The switcher could be
enabled by setprop ro.bluetooth.leaudio_offload.supported=true

screenshot: https://screenshot.googleplex.com/6aGP664S9PX5EMS

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I8adcf27edd1438df445d32fca93f35ff5020a3b3
Merged-In: I8adcf27edd1438df445d32fca93f35ff5020a3b3
(cherry picked from commit 0d11fd07e7)
 2022-06-07 09:36:15 +08:00
menghanli
9c9a5e4c41 Setup ToggleDaltonizerPreferenceFragment test infrastructure 
Bug: 229831598
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleDaltonizerPreferenceFragmentTest
Change-Id: I157a8aa63bcb6fc816b51957bd64425e710c438d
 2022-06-07 08:59:20 +08:00
Automerger Merge Worker
dec9ae78c3 Merge changes from topic "am-25f6a72642164283be9362e18a8e52e6" into tm-d1-dev-plus-aosp am: d86ace768b am: df27efaa8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296

Change-Id: I1f616679df4a094d1fd80524ba5eaeb41b2966c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:30:01 +00:00
TreeHugger Robot
e2cedd53fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 4322a2ffea -s ours am: f1e2b557bc -s ours am: 6e61a46bf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If687af4960695ca8d9dc0c71ed2d140a5d2c72dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:29:51 +00:00
Automerger Merge Worker
361de07c90 Merge changes from topic "am-57e0d74080e946758c2b4cbce9ad25bc" into tm-qpr-dev-plus-aosp am: d6b1cd7123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296

Change-Id: I5652a5988efc69b6d1d6e2667bdf0c691c4ae3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:28:18 +00:00
TreeHugger Robot
8e1a6aacef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours am: 688597e471 -s ours am: e064dd08b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5f8eed0059194e4e8e3d9e7dd3f2bec6df6db7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:28:09 +00:00
TreeHugger Robot
ab553408aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours am: 150bdf72ee -s ours am: 0c8b430341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I769758e631b0eb02221e5cdd83f48e2c4d7b5c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:23:53 +00:00
Bill Yi
c632b8c24c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -s ours am: f190bf482e -s ours am: 03bb2b929d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a432257a0eb0c7b3c64a5512cd2c1463c19d8c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:23:50 +00:00
TreeHugger Robot
48c43ac6ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -s ours am: 5018fa585f -s ours am: bd72b20ae3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34ca260cef02f7b1d16bfc91bc0a75e4040fd90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:23:45 +00:00
Bill Yi
1cc10e284b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -s ours am: 3d24ab77c4 -s ours am: 77cf1488c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77874360c179972033a7f7a07529a7487e843c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:23:35 +00:00
menghanli
a70fd0937f Setup ToggleColorInversionPreferenceFragment test infrastructure 
Bug: 229831595
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleColorInversionPreferenceFragmentTest
Change-Id: I1b9c6f2472a68ce7e820dae6e56a88791c4dcf2d
 2022-06-07 08:10:19 +08:00
Automerger Merge Worker
df27efaa8e Merge changes from topic "am-25f6a72642164283be9362e18a8e52e6" into tm-d1-dev-plus-aosp am: d86ace768b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296

Change-Id: I46cbe667e3d1961b9b66f0c605266fdb38478bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:08:23 +00:00
TreeHugger Robot
6e61a46bf4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 4322a2ffea -s ours am: f1e2b557bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I167c2cfa96bf06bf12eaab0f9c5b8e5d505f84f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 00:08:14 +00:00