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
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
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
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
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
Treehugger Robot
e10d0237c2
Merge "Use Mockito Kotlin" into main
2023-08-21 11:26:14 +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
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
mxyyiyi
cd8f9ab052
[automerger skipped] Update power_anomaly_event proto fields am: 980116be4d
am: 851d31df23
-s ours
...
am skip reason: Merged-In If4e6684c8169dfa3edd4e18a11d518737a3b2840 with SHA-1 af8fdee7e3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24440948
Change-Id: I1a9c0bc3bb10dbea6b282e097e8d461bf39c256a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 08:03:34 +00:00
mxyyiyi
851d31df23
Update power_anomaly_event proto fields am: 980116be4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24440948
Change-Id: If97fb080ddead0d37886444e92e1f98e1c235c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 07:30:46 +00:00
mxyyiyi
6b5273f985
Modify the name of power_anomaly_event enum fields
...
Test: manual
Bug: 291689623
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:93112b075979c2829bd3fa14c87160e361f66a82 )
Change-Id: I1df76167548033887a6227d7b643117c28d68125
2023-08-18 06:10:46 +00:00
mxyyiyi
980116be4d
Update power_anomaly_event proto fields
...
- add enum PowerAnomalyType/PowerAnomalyKey
- update the func to get anomaly index
Test: manual
Bug: 291689623
Change-Id: If4e6684c8169dfa3edd4e18a11d518737a3b2840
Merged-In: If4e6684c8169dfa3edd4e18a11d518737a3b2840
2023-08-18 14:10:06 +08:00
Angela Wang
65a9173d57
Fix flash notification preview not working for second user issue
...
When switching to second user and try to preview the flash notification
effect it'll not work. The root cause is the receiver is registered in
system process and the broadcast is sent as second user. Needs to send
the broadcast as system user to let the receiver receive the preview
broadcast.
Bug: 286039180
Test: atest FlashNotificationsPreviewPreferenceControllerTest
Test: switch to second user and test the preview function
Change-Id: I7dd553dac9fd66dab59eaec25849aac9f92989b6
2023-08-18 05:55:33 +00:00
Charlotte Lu
9540e60083
Java crash - AID_SYSTEM_USER - SimListDialogFragment.updateDialog - java.lang.NullPointerException.
...
This error may be because onCreateDialog did not initialize mSubscriptions correctly, causing it to be null.
java.lang.RuntimeException: java.lang.NullPointerException at com.android.settings.sim.SimListDialogFragment.updateDialog.
Fix: 194175217
Test: Manual Test
Change-Id: I761fed847441c6061ea4690658f06b9c2021bcee
2023-08-18 05:48:35 +00:00
Chaohui Wang
bd139deb91
Convert SimDialogActivityTest to Kotlin
...
Bug: 289155281
Test: unit test
Change-Id: Idf628cbfc0c49ae1bbb8a6c4c319f70f74b505d6
2023-08-18 13:19:06 +08:00
Xinyi Mao
12f8f5ac7a
Merge "Update power_anomaly_event proto fields" into main
2023-08-18 02:52:18 +00:00
Xinyi Mao
26a2056b8e
Merge "Update the detect & show pipeline for PowerAnomalyEventList." into main
2023-08-18 02:52:02 +00:00
Zaiyue Xue
aa37dd953e
Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev am: 1dad0bf856
am: d1a0370ddb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211971
Change-Id: I2e0c1388e423cc18db20bbbb1f14b73d9667199f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 02:47:49 +00:00
YK Hung
6b6267ecf8
[automerger skipped] Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev am: 1119c81d10
am: 1b961c35ff
-s ours
...
am skip reason: Merged-In I0c477dc546ec4d00e4c4133afb61bf7d574be9f8 with SHA-1 4ea5aaf5ef
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24400415
Change-Id: I1c8aa1e62565ca8f2cb55fa706ea972a88c5e740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 02:40:41 +00:00
Zaiyue Xue
d1a0370ddb
Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev am: 1dad0bf856
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211971
Change-Id: I5b3b38a62fba34203e0195cdcc510c68f8e12652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 02:39:34 +00:00