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
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
Zaiyue Xue
1dad0bf856
Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev
2023-08-18 02:35:15 +00:00
YK Hung
1b961c35ff
Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev am: 1119c81d10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24400415
Change-Id: I81f08d96e2867dd70d031bb7ee4a05756daa33ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 02:08:40 +00:00
YK Hung
1119c81d10
Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev
2023-08-18 01:35:31 +00:00
Edgar Wang
6e5f75dfd6
Merge "Make RadioButtonPickerFragment support highlight preference" into main
2023-08-18 01:05:03 +00:00
Rex Hoffman
3c961e1c0e
Setup external/robolectric for SettingsRoboTests
...
Current failing tests: ab/I64100010182936387
Had to Ignore some of com.android.settings.accessibility tests, which will be fixed separately
Bug: 261728063
Test: atest SettingsRoboTests -- --test-arg com.android.tradefed.testtype.IsolatedHostTest:java-flags:-XX:CompressedClassSpaceSize=3g
Change-Id: I4a0cb992db924936826e0c9808accc78dddb5f30
2023-08-17 22:33:20 +00:00
Joshua Mccloskey
cdc91b0056
Merge "Adding owners file for biometric settings." into main
2023-08-17 22:02:18 +00:00
Joshua Mccloskey
e198ff269b
Merge "Modifying FingerprintSettingsV2 structure" into main
2023-08-17 22:01:58 +00:00
Anvesh Renikindi
4f510190b3
[automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8
am: 5a6d7745d0
-s ours am: e81a0072ce
-s ours
...
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 4ca80e6013
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446787
Change-Id: Id21424350383910aa031e6fc33680303fd363762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 18:03:45 +00:00
Anvesh Renikindi
e81a0072ce
[automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8
am: 5a6d7745d0
-s ours
...
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 4ca80e6013
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446787
Change-Id: I83b30c97b8b21d6eb1d14b238088f0708d8e68a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 17:34:12 +00:00
Anvesh Renikindi
5a6d7745d0
Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446787
Change-Id: If307c1d7545d2528aa271a98fc8f236b0d5570bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 17:14:29 +00:00
Anvesh Renikindi
942e44c0b8
Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp
2023-08-17 16:49:52 +00:00
Jeff DeCew
c575812540
Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev am: 745b7dca9f
am: fa4994e1a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24405286
Change-Id: I8d1740726ce793bbdf3b3effcee5d1f0d523a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 16:20:09 +00:00
Jeff DeCew
fa4994e1a2
Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev am: 745b7dca9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24405286
Change-Id: Ia9daf2b103e562891356bf638bfa097b283add83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 15:50:31 +00:00
Jeff DeCew
745b7dca9f
Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev
2023-08-17 15:35:28 +00:00
Vania Januar
e2108b4b5b
Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev am: a928e9202f
am: 728bf8b8b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446427
Change-Id: I4d2d00428e09d1f2a07f6a777328b42c146dd183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 13:29:07 +00:00
Edgar Wang
a1207d2b76
Make RadioButtonPickerFragment support highlight preference
...
Bug: 296356424
Test: visual
Change-Id: If8b093dcdbf2dda910a3236f75bed4fc363cd02a
2023-08-17 09:47:44 +00:00
Treehugger Robot
b01d241023
Merge "Gray out the "Remove account" button when there's a restriction" into main
2023-08-17 09:22:10 +00:00
Vania Januar
728bf8b8b7
Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev am: a928e9202f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446427
Change-Id: Ic6326aaf9622027f8347d643b99565165e2b3efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 08:44:37 +00:00
Jason Chiu
b6c2108c93
Gray out the "Remove account" button when there's a restriction
...
Fix: 243011338
Fix: 288887119
Test: robotest, manual
Change-Id: Ie3d6607f69a5e7c66bb750febc4d526d6d209ac6
2023-08-17 16:30:11 +08:00
Vania Januar
a928e9202f
Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev
2023-08-17 07:50:54 +00:00
mxyyiyi
2037b262ff
Impl the detect & show pipeline for PowerAnomalyEventList.
...
Test: make SettingsLibRoboTests
Bug: 293813663
Bug: 296322845
Change-Id: I0c477dc546ec4d00e4c4133afb61bf7d574be9f8
Merged-In: I0c477dc546ec4d00e4c4133afb61bf7d574be9f8
2023-08-17 06:35:49 +00:00
mxyyiyi
a7a0949a35
Update the detect & show pipeline for PowerAnomalyEventList.
...
Test: make SettingsLibRoboTests
Bug: 293813663
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f978f8b045c2d08e07735f0e7c2b343d53fb5580 )
Change-Id: I4a5a550b8c1a2317468e8cc4bd8c2b594c4208ac
2023-08-17 03:55:21 +00:00
Treehugger Robot
ab4ee23850
Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493
am: 565161fb1a
am: 47f8568209
am: fc02a337f8
am: 7e297c494a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973
Change-Id: Ifda23786d9102042d4beb2ce09b4bfd24f911cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:32:50 +00:00
Treehugger Robot
1528657fce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a
-s ours am: 62c6c859fb
-s ours am: bc55c69e9c
-s ours am: 2f6fc7155a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434423
Change-Id: Ib38b801872c766f72b8758f36ed4440ceebb86ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:26:56 +00:00
Bill Yi
fcb94c583d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5
-s ours am: 1b8cdb3c54
-s ours am: 3f1da62e96
-s ours am: 05b9ab239f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434423
Change-Id: Id7a91f9e89c179005cc70d39c6bfca934e17b0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:26:47 +00:00
Treehugger Robot
98c11feba8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834
-s ours am: b04d88f081
-s ours am: cd8a489f80
-s ours am: 63353599ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: Ie7811a3f795c1f4e168bfda652febfb244171e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:26:43 +00:00
Bill Yi
002f72a2b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35
-s ours am: f7a1f6301c
-s ours am: 34a88d2b41
-s ours am: 3d0cc12624
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: I9026a730532b2b5cd837b58ab4eac76fa4e7f76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-17 02:26:30 +00:00