Bill Yi
74aa510bd0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: 99073e56cc
-s ours am: 3fbec94efd
-s ours am: 206a0916b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Ifa12f6b6c55638d4801e4482d45b48dddee51a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:29:19 +00:00
Treehugger Robot
65e9a2206f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: 113ac8d105
-s ours am: c1a9f3b899
-s ours am: 29e93d4241
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I7a753c196a1d57fc0997b4b4f458b7a809deab26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:28:05 +00:00
Bill Yi
648c8b8dc4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: 99073e56cc
-s ours am: 9627696277
-s ours am: 022231ddfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Id6d8cfc75493033b38ed1f2bca8997280719aa7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:28:03 +00:00
Treehugger Robot
66263ddea7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: ced1f0f311
-s ours am: 4b343ece13
-s ours am: 1d562cda45
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I7e377546936512e7af7cefa80cd4ccb6d48f47a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:25:47 +00:00
Bill Yi
b7c331a070
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: bb043fa69a
-s ours am: c259f9189b
-s ours am: d84e7d955d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I8567d7eadd4bdba5629d87e1b7eeafe2ef27200a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:25:42 +00:00
Treehugger Robot
cb61bf5909
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: 113ac8d105
-s ours am: 60576c7278
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Ic2f1cae8125c0e01b7696a9ee3731985219a648b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:21:35 +00:00
Bill Yi
206a0916b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: 99073e56cc
-s ours am: 3fbec94efd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Iaa5d28846696851cddebb4374e620dd88c33fd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:21:31 +00:00
Treehugger Robot
29e93d4241
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: 113ac8d105
-s ours am: c1a9f3b899
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Idcece623d0a3a058f9f12021fcecf8e062e05c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:16:38 +00:00
Bill Yi
022231ddfb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: 99073e56cc
-s ours am: 9627696277
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Icf186a242aba79a0b3ae0fc3d797e9749689529f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 19:16:32 +00:00
Treehugger Robot
c1a9f3b899
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: 113ac8d105
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Icec8d0e0f417da0f480689e328c5ea89718217c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:50:09 +00:00
Bill Yi
9627696277
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: 99073e56cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Iec3486257c3b84741f2260925d86e6dfd338e4b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:50:05 +00:00
Treehugger Robot
1d562cda45
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: ced1f0f311
-s ours am: 4b343ece13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I62494fbf49eb5508d90fe21f52687e19115c505d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:45:09 +00:00
Bill Yi
d84e7d955d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: bb043fa69a
-s ours am: c259f9189b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I3896d92494c875958a3e7298d8364983c72666c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:45:05 +00:00
Treehugger Robot
60576c7278
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: 113ac8d105
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I756267739c15c4c6a4f022fd74c9cc805fc44cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:44:15 +00:00
Bill Yi
3fbec94efd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: 99073e56cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Ic27c81951e5d36e37571225bdc1071e8dff71c05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:44:11 +00:00
Treehugger Robot
4b343ece13
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: ced1f0f311
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Ic3d6b7af6a753a5c1317fb06fe13ca91987be35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:18:54 +00:00
Bill Yi
c259f9189b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: bb043fa69a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I28caee0961f5593b64b79ac68572c3ba7e8b16ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:18:52 +00:00
Treehugger Robot
1b3d9dafc6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours am: c34cae32c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I7f47d69b7e26dc1c64c6bc6706cecbf3f9f88768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:18:12 +00:00
Bill Yi
0232b3f150
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours am: d6d94306c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I84a879c1b6e7fabc8ddb924c43aad71ca6f90cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:18:07 +00:00
Treehugger Robot
113ac8d105
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I5180ce7f5bd3564f9e80ce4ef51259526e7f94a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:38:29 +00:00
Bill Yi
99073e56cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Iaff959abd8c1eadac9f5a570202fb5eee0895ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:38:26 +00:00
Treehugger Robot
c34cae32c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I589a6145adad69b5041f0dddab5f9caa03848fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:36:45 +00:00
Bill Yi
d6d94306c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Ib573dc85293cb08ca66fa6073885421b124f32e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:36:41 +00:00
Treehugger Robot
ced1f0f311
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: Idfc84ae81d74aa5a5a7358b720d1b7e00740cb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:36:15 +00:00
Bill Yi
bb043fa69a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24485648
Change-Id: I403572a913f7a7c5a985bc779a71f816fd47d157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:36:10 +00:00
Vlad Popa
0134421059
Merge "Do not show SA preference for device that do not support it" into main
2023-08-21 16:49:21 +00:00
Treehugger Robot
44e242075a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-08-21 16:43:37 +00:00
Weng Su
27b3821313
Add Instant hotspot preference
...
- Add Instant hotspot preference to Wi-Fi hotspot settings
- Wait onServiceConnected callback and then getSettingsState
- Use the PendingIntent provided by SharedConnectivitySettingsState to launch Instant hotspot settings
Bug: 268550769
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
SharedConnectivityRepositoryTest
Merged-In: I343599e6127d9b1cb4af661dcc80a8683589c7b8
Change-Id: I343599e6127d9b1cb4af661dcc80a8683589c7b8
2023-08-21 12:21:25 +00:00
Treehugger Robot
e10d0237c2
Merge "Use Mockito Kotlin" into main
2023-08-21 11:26:14 +00:00
Weng Su
63321a1a83
Add Instant hotspot preference
...
- Add Instant hotspot preference to Wi-Fi hotspot settings
- Wait onServiceConnected callback and then getSettingsState
- Use the PendingIntent provided by SharedConnectivitySettingsState to launch Instant hotspot settings
Bug: 268550769
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
SharedConnectivityRepositoryTest
Change-Id: I343599e6127d9b1cb4af661dcc80a8683589c7b8
2023-08-21 11:14:04 +00:00
Treehugger Robot
8cfb640bf3
Merge "Add UI metrics logging for battery tips card." into main
2023-08-21 09:21:49 +00:00
Chaohui Wang
8647256269
Use Mockito Kotlin
...
Which has better support for Kotlin unit test.
Bug: 289155281
Test: unit test
Change-Id: Ic98ba7e66c124e8398ad01d3bca7ee3a771b06c4
2023-08-21 17:01:52 +08:00
Zaiyue Xue
f838f5d5fa
Add UI metrics logging for battery tips card.
...
Bug: 291689623
Test: manual
Change-Id: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
2023-08-21 08:12:03 +00:00
Chaohui Wang
4957e2d000
Merge "Clean up unused fields from EntityHeaderController" into main
2023-08-21 07:47:09 +00:00
Chaohui Wang
cc2133ba8e
Clean up unused fields from EntityHeaderController
...
Bug: 295260929
Test: manual - on pages with header
Test: robo test
Change-Id: Icebd63dbb5d3d44b4b46d3bececb8b65b30b4883
2023-08-21 13:58:07 +08:00
Charlotte Lu
a796508aa2
Merge "Java crash - AID_SYSTEM_USER - SimListDialogFragment.updateDialog - java.lang.NullPointerException." into main
2023-08-21 02:19:15 +00:00
Angela Wang
6bb80b42bf
Merge "Fix flash notification preview not working for second user issue" into main
2023-08-19 08:38:38 +00:00
Vlad Popa
6af54b3225
Do not show SA preference for device that do not support it
...
Checking the spatializer immersive level to determine whether to show or
not the spatial audio preference in bluetooth settings
Test: manual on cheetah and bluejay
Bug: 296636479
Change-Id: I2f113f6d66acd30fd25d05556b99407cbc280e0a
2023-08-18 16:21:46 -07:00
Kevin Liu
dad495d745
Merge "Setup external/robolectric for SettingsRoboTests" into main
2023-08-18 21:56:24 +00:00
Hao Dong
6bff9615fc
Fix face delete button rotation not working. am: 94f759230a
am: f55c4be4d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484929
Change-Id: I4ac57b657cc5dc8073eb55244f036ac4291cf0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 21:16:01 +00:00
Hao Dong
f55c4be4d4
Fix face delete button rotation not working. am: 94f759230a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484929
Change-Id: I97275e1f64fa87f615444870d894e05f386c5eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 20:40:19 +00:00
Bill Yi
75987a1856
Import translations. DO NOT MERGE ANYWHERE
...
BUG:291684185
Auto-generated-cl: translation import
Change-Id: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
2023-08-18 12:17:43 -07:00
Hao Dong
94f759230a
Fix face delete button rotation not working.
...
Bug: 264503740
Test: make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="FaceSettingsRemoveButtonPreferenceControllerTest"
Change-Id: I28a281ca1ed16940400c44272f9fa78f5eb190af
2023-08-18 18:51:02 +00:00
Oli Thompson
974bb9ba9f
Merge "Add show emergency button call to biometric prompt" into main
2023-08-18 17:54:34 +00:00
Andreas Miko
887c955a01
Change nullability of inheriting function of PinPrivacyPreferenceController
...
Test: None
Bug: b/292569343
(cherry picked from commit a7d7eb9a16
)
(cherry picked from commit 4ca80e6013
)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05514d0f4d5b6603da6a79881becb0b768e586a6 )
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
2023-08-18 16:22:17 +00:00
Chaohui Wang
2ba1805e27
Merge "Clean up unused NetworkPolicyEditor" into main
2023-08-18 11:43:00 +00:00
Chaohui Wang
aba17fc847
Merge "Convert SimDialogActivityTest to Kotlin" into main
2023-08-18 11:09:51 +00:00
Chaohui Wang
334eb0b111
Merge "Remove DataUsageSummaryPreference unused fields" into main
2023-08-18 10:27:35 +00:00
Chaohui Wang
abe2710dc0
Clean up unused NetworkPolicyEditor
...
From DataUsageSummaryPreferenceController.
NetworkPolicyEditor.read() is not called, so
NetworkPolicyEditor.getPolicy() will always returns null.
Data limit info is already set in getDataUsageInfo().
Bug: 295260929
Test: robo test
Change-Id: I56a40cc906aa95207785886e704b1a59ea344e9c
2023-08-18 17:18:23 +08:00
Chaohui Wang
83e402a412
Remove DataUsageSummaryPreference unused fields
...
Bug: 295260929
Test: robo test
Change-Id: Ie44bc3e3b8b2e123bd51e2f9ee93ca9614ba54d3
2023-08-18 16:39:17 +08:00