Bill Lin
855dc04b31
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c46d am: b154b58576
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742513
Change-Id: Ia0594542f46c9d3b62c0e78f439d1d13cecdbcd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 02:11:55 +00:00
Bill Lin
b154b58576
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c46d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742513
Change-Id: I95c27570429ac01d467545543627ef0854194113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 01:50:30 +00:00
Bill Lin
37dfb4c46d
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev
2022-08-26 01:19:04 +00:00
Menghan Li
9c16fc3732
Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev am: b5ee432b4b am: f481637370
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732075
Change-Id: Id2a2972186010af063d97c8f6c37947f668c05eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 00:09:41 +00:00
Menghan Li
f481637370
Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev am: b5ee432b4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732075
Change-Id: Ib412dc1639942389c417ec2516a1f99b52a951f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 23:49:57 +00:00
Menghan Li
b5ee432b4b
Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev
2022-08-25 23:37:50 +00:00
Joshua Mccloskey
94859d0642
Merge "Replaced fingerprint finish strings." into tm-qpr-dev am: 128746648e am: f74ddd65b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19736606
Change-Id: Ifefac73fa45e44816efd0cae2cea58ea0a30a135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 22:56:07 +00:00
Joshua Mccloskey
f74ddd65b8
Merge "Replaced fingerprint finish strings." into tm-qpr-dev am: 128746648e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19736606
Change-Id: Iab77f3cf874f4271f603a9575afeff0ffd8732af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 22:35:13 +00:00
Joshua Mccloskey
128746648e
Merge "Replaced fingerprint finish strings." into tm-qpr-dev
2022-08-25 22:20:32 +00:00
TreeHugger Robot
fb2090e643
Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart"
2022-08-25 16:19:14 +00:00
TreeHugger Robot
2802ec1c44
Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()."
2022-08-25 16:19:10 +00:00
lbill
b77c2639d9
Refine face enroll & remove button layout padding
...
The button include in the security_settings_face.xml
When FaceSettingsRemoveButtonPreferenceController#updateState(),
the margin of Button will be overrided by FooterButtonStyleUtils.
So we should set listPreferredItemPaddingStart or End for Button's
parent view instead.
Test: manual Security > Face Unlock > Delete face model
> Set up face unlock > Back > Check the button layout
Bug: 202091542
Change-Id: I2b3815f5484ae1e5d256a43b432384e5f0f0f96a
2022-08-25 10:24:09 +00:00
Tom Hsu
4d7259124c
Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev am: 12377854b1 am: 7ddbff8eca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674442
Change-Id: I43c9870d10b567590d7d18968e36989584d76458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:45:00 +00:00
Tom Hsu
a4c1b781d7
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev am: 34cb6d3237 am: a18ec335a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674012
Change-Id: If2e0c2b9b4d8e981ea42eeea4ebdbe0617f998cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:44:57 +00:00
Tom Hsu
039563f77d
Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3 am: 7dfd2ade2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790
Change-Id: Ia139b19e541ebc66ea0228417a4cefa06a4ce93d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:44:56 +00:00
Tom Hsu
7ddbff8eca
Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev am: 12377854b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674442
Change-Id: I43489e9e2476925c2680b8ec7da335900e0ad106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:46 +00:00
Tom Hsu
a18ec335a9
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev am: 34cb6d3237
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674012
Change-Id: I30906dc1a60949776b27ba6df3fe723f1eed6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:44 +00:00
Tom Hsu
7dfd2ade2f
Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790
Change-Id: I767bf8a2b177a5b764458e7c8fff90e3de1b869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:42 +00:00
Zaiyue Xue
8e00605228
Fix b/243485315: NullPointerException when getAppBatteryUsageData().
...
Bug: 243485315
Fix: 243485315
Test: presubmit
Change-Id: I8bb2db7976f6c8817e9ab45fe3a40456afcd8128
2022-08-25 14:50:32 +08:00
Tom Hsu
12377854b1
Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Tom Hsu
34cb6d3237
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Tom Hsu
bd3c0da9e3
Merge "[Languages] Add new information to system language page." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Bill Lin
1e60f829e9
Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391 am: ac4f84f05d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587
Change-Id: I1d714e27beaa1f3ac5bccd45e5c11663d2fcba19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 06:10:59 +00:00
Zaiyue Xue
079aaf1261
Fix b/243746796 Crash when mouse hangs over an empty battery chart
...
Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
2022-08-25 13:45:01 +08:00
Bill Lin
ac4f84f05d
Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587
Change-Id: I404da502a6cfa3d8e40ca7ee935332e9e4931968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 05:41:19 +00:00
Bill Lin
fd8e54e391
Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev
2022-08-25 04:36:14 +00:00
TreeHugger Robot
5d42149249
Merge changes from topic "nfc_logging_control_master"
...
* changes:
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
Show reboot dialog when users disable developer options
Add a new NFC developer setting option for NFC vendor verbose log
Add a new NFC developer setting option for NFCSNOOP
2022-08-25 03:31:24 +00:00
Joshua McCloskey
15a1adbe8f
Replaced fingerprint finish strings.
...
Test: Verified manually correct string shows.
Fixes: 239614495
Change-Id: I5b52d21fb6a9faf5769de46ccb17308a1649e22a
2022-08-25 00:35:09 +00:00
Chloris Kuo
a79194f081
[automerger skipped] Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831 am: fd947cb0b3 -s ours
...
am skip reason: Merged-In I6566cd9d615331a56728613583295637982bcd3f with SHA-1 5adf602ef7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110
Change-Id: I3ef2ce278cf4aff6d06ad76c066e4c9b19536fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 23:18:08 +00:00
Chloris Kuo
fd947cb0b3
Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110
Change-Id: If0ff5b45d3e38a1e5b08cb6a648ea64474b731d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 22:59:00 +00:00
Chloris Kuo
6f79ffd831
Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev
2022-08-24 22:37:58 +00:00
menghanli
66a96d220e
Fix tapping magnification crash in vision settings setup screen
...
Root cause: ag/17286343 introduces hiding the settings entry in magnification settings if window magnification feature is not supported. It causes SuW page cannot find the settings preference reference.
Solution: Add null pointer check.
Bug: 242242266
Test: Manual testing
Change-Id: I1007a580047dd302228b28c15b82e958a2b01fec
(cherry picked from commit 5a87f6bbbf )
2022-08-24 21:17:46 +00:00
Menghan Li
dc37f44a40
Merge "Fix tapping magnification crash in vision settings setup screen"
2022-08-24 21:17:21 +00:00
Chloris Kuo
54c677a83c
Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications
...
Show detail settings page from the default NAS app if it implements the new intent ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS.
Test: Robotest, manually test on device
Bug: 231492005
Change-Id: I6566cd9d615331a56728613583295637982bcd3f
Merged-In: I6566cd9d615331a56728613583295637982bcd3f
2022-08-24 19:51:08 +00:00
Michael Wright
3b0cbefac1
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085 am: bbde399410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797
Change-Id: Idcaa343d56921b2f2b4428a10fb5dffc99a0c698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 16:11:16 +00:00
Michael Wright
bbde399410
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797
Change-Id: Ifa352490aff4a215710aec57e6d42aab162d5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 16:05:15 +00:00
Michael Wright
1218065085
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev
2022-08-24 15:24:15 +00:00
Lucas Silva
285bfe2917
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev am: 225b3b0640 am: 1eeae5a623
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699464
Change-Id: I51e5d21ba7e79c7752f2c824710443396257d025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 14:45:51 +00:00
Lucas Silva
1eeae5a623
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev am: 225b3b0640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699464
Change-Id: Iaf38d68d9a2c03c2612ae17fec3094bc41087edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 14:16:59 +00:00
Lucas Silva
225b3b0640
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev
2022-08-24 13:54:16 +00:00
lbill
7a4ddb8337
Set appropriate theme for SkipFingerprintDialog
...
The SkipFingerprintDialog is instantiation in
SetupFingerprintEnrollFindSensor#onSkipButtonClick()
Due to the call flow did not set appropriate theme
defined in setuplib for skip alertDialog instance
we set GlifV2ThemeAlertDialog AlertDialog.Builder.
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
SetupFingerprintEnrollFindSensorTest
Test: manual factory reset, go through SUW, and check
skip AlertDialog Bottom Bar Buttons visual.
Bug: 233243999
Change-Id: Ic198a23eb3e76d70e287b24f2ab1ef249b30b2fc
2022-08-24 13:45:21 +00:00
Michael Wright
475632c4fe
Revert^3 "Improve App notification loading"
...
33710fd9e2
Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
2022-08-24 12:22:12 +00:00
menghanli
5a87f6bbbf
Fix tapping magnification crash in vision settings setup screen
...
Root cause: ag/17286343 introduces hiding the settings entry in magnification settings if window magnification feature is not supported. It causes SuW page cannot find the settings preference reference.
Solution: Add null pointer check.
Bug: 242242266
Test: Manual testing
Change-Id: I1007a580047dd302228b28c15b82e958a2b01fec
2022-08-24 11:39:33 +00:00
kellyz
b75c9173ed
[automerger skipped] Enable predictive back gesture for Settings app. am: 76516bbd3d am: cf78e650f7 -s ours
...
am skip reason: Merged-In Ib75902d1d7bbd289705cb62ef00d5840676bda72 with SHA-1 1bda6428c2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19697762
Change-Id: I2ff85eabc3591009d4b5572d9c6791a3041fe927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 08:24:08 +00:00
kellyz
cf78e650f7
Enable predictive back gesture for Settings app. am: 76516bbd3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19697762
Change-Id: I9b782ec75a470bb90568e6a4c2be3f4067f556d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 08:14:21 +00:00
Bonian Chen
4e5102b5e9
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev am: 6920c9e7ce am: 80e17e97f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673417
Change-Id: I42f5a94866902b0812039025071fd95b8c8745b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 08:14:03 +00:00
kellyz
76516bbd3d
Enable predictive back gesture for Settings app.
...
Bug: 238729272
Test: manually tested on device
Change-Id: Ib75902d1d7bbd289705cb62ef00d5840676bda72
(cherry picked from commit 1bda6428c2 )
Merged-In: Ib75902d1d7bbd289705cb62ef00d5840676bda72
2022-08-24 07:26:24 +00:00
Bonian Chen
80e17e97f3
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev am: 6920c9e7ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673417
Change-Id: I0ce4c4789f2e839ab92b71a8b517cc2680e49c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 07:03:40 +00:00
Bonian Chen
6920c9e7ce
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev
2022-08-24 06:38:58 +00:00
Wesley Wang
320ad12543
Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92a1 am: 20e927164b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19695293
Change-Id: I288c58df33642427aa8b39f3d1af6f4cb521c8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:30:00 +00:00