Wenhui Yang
4eceb6c5c5
Merge "Fix face model delete message" into udc-qpr-dev
2023-06-06 21:09:56 +00:00
Ale Nijamkin
163c01ab4c
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 20:27:23 +00:00
Ale Nijamkin
dc6449157b
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: Iac1b92075d8113012e69bdc82462921191690ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 20:26:05 +00:00
Ale Nijamkin
d31487b529
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 306421f87f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: I6ca144e73e9d3e4465dcfd0325b57add2f61f426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 20:23:19 +00:00
Ale Nijamkin
1e3ecf6352
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 19:44:29 +00:00
Wenhui Yang
5e71aee4cd
Fix face model delete message
...
Add new strings for face model deletion when fingerprint unlock is available.
Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
2023-06-06 19:44:17 +00:00
Ale Nijamkin
ef6f54982a
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: I9248f9d94bbd8bbea16c93cd2a1a259fa43fa1d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 19:41:14 +00:00
Ale Nijamkin
b5dda005fd
Merge "Fixes nav stack issue." into udc-dev
2023-06-06 18:48:59 +00:00
Aleksandar Kiridzic
a882fd268d
speech: On-device recognition settings profile selector
...
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.
Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
2023-06-06 14:10:34 +01:00
SongFerngWang
13cd052693
ForgetDeviceDialogFragment check whether device is null or not
...
Bug: 280687867
Test: build pass
Change-Id: I4134569854165f20f6287406d9ed627b2c15c05b
2023-06-06 09:53:36 +00:00
Alejandro Nijamkin
6f9f3a4594
Fixes nav stack issue.
...
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.
Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.
Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
2023-06-05 16:02:17 -07:00
Justin Gross
73dcd293c3
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I2753b78613de8d49c3dad49b4b5cd5ce058d0e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 19:49:39 +00:00
Justin Gross
e8e2f86c4c
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I3463151328ed5ed16afb20616dd4f6e9653ac143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 19:27:32 +00:00
Justin Gross
b9d09dddda
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I4bed3fa8bf3800894c159b2e6c11361ee1cf0cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 19:25:12 +00:00
Justin Gross
b70ec810f7
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 7dd84f9399
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I3e385188a3698b07bf9ff603e63389cafb28f2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 19:24:55 +00:00
Justin Gross
5e2768327a
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I17069f20447108b5346fc7246288e8ba93b35f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:37:33 +00:00
Justin Gross
0e3ea95a58
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: Id08742370d36beeacedcad6538c8482c465b0324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:36:49 +00:00
Treehugger Robot
13c488fc3c
Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb am: 065885622b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343
Change-Id: I938c2414fec70253fa4c38f8e5959d04e121e2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:36:44 +00:00
Treehugger Robot
065885622b
Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343
Change-Id: Iee500ce4346a8554a37a4ff98ae5f3775b3ad411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:03:19 +00:00
Justin Gross
89e829e3dc
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev
2023-06-05 18:00:15 +00:00
Treehugger Robot
dbec7ba7fb
Merge "Use custom action key icon" into udc-qpr-dev
2023-06-05 16:56:35 +00:00
ykhung
ab5e21ec07
Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97 am: 7dec603727
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957
Change-Id: Ida834748587c6ad730a72dc510e9b21720ee9152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 07:45:38 +00:00
ykhung
7dec603727
Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957
Change-Id: I42405b0eef20370cc6a838d1040149f9a635d391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 07:02:11 +00:00
ykhung
53f48c4a97
Make the estimator cache logic is the same as SysUI flow
...
Ensure the remaining time estimator cache logic is the same as SysUI
https://source.corp.google.com/android/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java;l=375-386
Test: presubmit
Fix: 285747156
Change-Id: If7218dc70792aafaec45c71018897bed80df7f3d
2023-06-05 01:39:41 +00:00
TreeHugger Robot
f6f0c966a9
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 565f4b5730
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I045be75427f44db3ca778391bb64cbfe81822c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 23:10:47 +00:00
TreeHugger Robot
916c168218
Merge "Add @UsesReflection to FeatureFactory reflection usage"
2023-06-02 22:47:10 +00:00
TreeHugger Robot
4834abe241
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 22:23:17 +00:00
TreeHugger Robot
701610cd39
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: ac91d63f00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I240fa0143b223161965c470d6eaae678c0133026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 22:21:54 +00:00
TreeHugger Robot
565f4b5730
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I2bc382165446ca91d4662b151174463781ae5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 22:21:34 +00:00
TreeHugger Robot
a7b0933819
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ic495c899a15cfbfaca7edb76f4be6cb79c8f8c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 21:37:08 +00:00
TreeHugger Robot
f0503e2a51
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 21:36:40 +00:00
TreeHugger Robot
25d24e0cf0
Merge "Restrict SimDialogActivity" into udc-dev
2023-06-02 20:41:47 +00:00
Jared Duke
2278b3f952
Add @UsesReflection to FeatureFactory reflection usage
...
Ensure FeatureFactory implementations are kept using a @UsesReflection
annotation at the callsite where they are instantiated via reflection.
Bug: 272041779
Test: m + validate FeatureFactoryImpl is kept
Change-Id: Ia9b8c4fd2c438805f33561dcacd5c10ed49dee19
2023-06-02 20:30:39 +00:00
Jason Chiu
a655b96c28
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155 am: 3812b37db7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: Icfcbba42c812f93f7ee960f7f4aa46ba1d337c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 18:28:38 +00:00
TreeHugger Robot
b4409c9bf3
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: aac695129e am: 374aefc2d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040
Change-Id: I5c6a6d3c6b3698c07585e06c00073e7c7c76e19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 18:10:46 +00:00
Chaohui Wang
14f7f6c818
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3f05e59982
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: I0837bd1fd686f4d77c148a2405fe5ae8a644ac99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 18:04:47 +00:00
Jason Chiu
3812b37db7
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: I068fb33918911b727b529dd80db9f7f138c17b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:40:13 +00:00
Chaohui Wang
7804e5a59c
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: d9efea9f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: Ia0eed492961c046e1e3a0c6e531d4ddd9af10880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:25:18 +00:00
Treehugger Robot
5a718028b0
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: d19f4f85fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I748f8989347cc703c941e6bb41008f22e70d7627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:25:02 +00:00
TreeHugger Robot
374aefc2d7
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: aac695129e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040
Change-Id: I559c2dc8f9ba35a434d58551c33f6b10eec1d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:24:46 +00:00
Jason Chiu
d48ba61155
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: I0b0a3ae052e682bef38eb55c72fce82c3072a209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:58:22 +00:00
Chaohui Wang
d9efea9f79
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: I51a7c6cf0387b9dbe8a470a8aa2afa5b5695745f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:53 +00:00
Treehugger Robot
d19f4f85fd
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I9277de61513b892dee6517e2a6a393f77451e9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:40 +00:00
TreeHugger Robot
aac695129e
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040
Change-Id: I5202aa1f9202a906ef197a0f60209edf73df7ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:27 +00:00
Treehugger Robot
3ac151950a
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 88a51ef8be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: Id13a9a99f652848a60d38813e5802b9d34b1bcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:37:32 +00:00
Jason Chiu
933d3279a1
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797 am: d103243e8b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: I9fbae9cd746b9adfa710618868db7fd2a50224d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 11:06:15 +00:00
Jason Chiu
a8142278e9
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: I8a7966fd9f3ee88683c35fd4f2bd7b60b475cbcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 11:05:34 +00:00
Jason Chiu
b2ed35b2ae
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev
2023-06-02 10:27:14 +00:00
Jason Chiu
d103243e8b
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: Ie6f50f7e915be5990ba5f33c5e375f3508491b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 10:21:49 +00:00
Jason Chiu
2b8067e797
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: I2e223f815b9d96f0766a139cdee53884f47d849b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 09:34:10 +00:00