Guangjie (Jerry) Shi
2898e3b527
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev
2023-05-05 16:45:37 +00:00
Max Spencer
bd861db36f
Fix title of no-screen-lock notification
...
Discrepancy was surfaced during localisation testing.
Fix: 281054224
Test: None
Change-Id: Ifabafbf5af0775e25b2c41670318a3aabc2cb7f2
2023-05-05 16:21:52 +00:00
Jerry Shi
8d167d55f3
Do null check to account for the case where provider is only autofill
...
provider.
Test: local build
Bug: 281047738
Change-Id: I9f3dca118a0d4182e2d727fa011dcb48db2a553f
2023-05-05 14:59:27 +00:00
Marcello Galhardo
bb8c04e072
Move Note Shortcut from Settings to SystemUI
...
* Removes all code related to Note Shortcut from Settings
Test: manual
Flag: not needed
Fixes: b/280431176
Change-Id: I6bb6cfbb98a57b6ad3cf261626b3d84d0be96e53
2023-05-05 14:54:27 +00:00
Chaohui Wang
3a164bc0db
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49
am: 72f42fe9f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I2d6c0af8414dc753ebba0d82ef188ea136558749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:51:21 +00:00
Chaohui Wang
72f42fe9f2
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I4c0efabd30e2e9cf0d46477672741474bb8203f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:09:38 +00:00
Chaohui Wang
5b18837a49
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev
2023-05-05 11:32:13 +00:00
Vania Januar
a2f4601fa8
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
am: 247fed89c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: I63c9b6e5bdd23a0f57cc7729bcbd6606cb89c4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 11:27:18 +00:00
Vania Januar
247fed89c4
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Icc6d64627bba5370c4d68a0456c0d2641540cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:45:36 +00:00
Angela Wang
360cb671f2
Hides Flash Notifications illustration on tablet
...
Since tablet illustrations are not yet finalized, we'll hide the Flash
Notifications illustration on tablet for now.
Bug: 280748155
Test: checks the UI on phone and tablet manually
Change-Id: I5a309dec3291f3585cc1d9769e2465c94250fa7f
2023-05-05 09:54:04 +00:00
Vania Januar
072d8b90d0
Merge "Replace placeholder icons with stylus icons" into udc-dev
2023-05-05 09:50:11 +00:00
Chaohui Wang
39bf7dd530
Fix dialog leak in RequestPermissionActivity
...
Dialog still show when activity destroyed will cause leak.
Dismiss dialog when activity onDestroy to fix this issue.
Fix: 279522922
Test: Manually with "Don't keep activities"
Test: Robolectric Test
Change-Id: I445f4b160020823a6f6e2883055218c1224e2c48
2023-05-05 17:30:02 +08:00
Chaohui Wang
112e3233fd
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
am: 3d06aec9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: I2626fc0a38e21f319a50f413203b0aae086f3ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 09:21:43 +00:00
Chaohui Wang
3d06aec9ab
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: Id277b59be091126b986475450cc36c89bf24f52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 08:19:39 +00:00
Chaohui Wang
7c042f374b
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev
2023-05-05 07:57:39 +00:00
Charles Chen
9dc35d21b4
Revert^2 Disable Settings large-screen optimization
...
Disable the optimization that is automatically enabled when
including Window Extensions through Activity Embedding.
The optimization causes to launch an additional trampoline
activity for deep links, even when the screen size is smaller
than required by Activity Embedding rules.
Bug: 267725145
Bug: 279461170
fixes: 280606740
Test: Build, perf metrics
Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests
Test: atest SettingsMultiPaneDeepLinkTest.java
Test: run v2/aep-ironwood/suite/test-mapping-ironwood-p0-cujs via ABTD
on cheetah/oriole/panther/raven in udc-dev/master branch
Change-Id: I74c9608fce92fc77c0f1ef2d61aba3af85afba02
2023-05-05 07:46:06 +00:00
Chaohui Wang
2adf3aa527
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I84a2cf46197e91fc0e840f7916fa34434914b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:35:22 +00:00
Chaohui Wang
8b550ddb4c
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I64197b730225942a2cab8cf154b1ad6f4b438e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:19:04 +00:00
Daniel Huang
daf2c793d1
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I206f901fc41f60a6a825b107dfa1cfeb94e5c608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:15:39 +00:00
Chaohui Wang
804214c160
Merge "Log app special permission change for SPA" into udc-dev
2023-05-05 03:03:52 +00:00
Daniel Huang
5f12c8fcf8
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I6d1705a4e749d9d46d1c52433e6d7b3a3766f713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 02:34:58 +00:00
Daniel Huang
08b2b68e22
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev
2023-05-05 02:33:13 +00:00
Becca Hughes
b1e0308d8f
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I00fc7b3c48ff0e921a07e9bebd8baccbb3211b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:26:23 +00:00
Becca Hughes
1955e67933
Use isPrimary bit to determine top provider am: 3096997718
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I9f410931f805bbf05bf3a7956a48483ed4388bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 23:49:42 +00:00
Becca Hughes
3096997718
Use isPrimary bit to determine top provider
...
If the cred man provider has the isPrimary
bit set then we should use it as top
provider.
Test: ondevice
Bug: 280454916
Change-Id: I8c5651909d3926f09549c64af68185f1ef633198
2023-05-04 21:19:54 +00:00
Oli Thompson
2330c13289
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
am: a99e532ce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I383dd7bb3c33516ffe70f404ff553289690016fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:03:11 +00:00
Oli Thompson
a99e532ce8
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I7af3a61b06c9922be100dbba9a2bd0b58ba784d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:57:31 +00:00
Oli Thompson
69fcc2ba5c
Merge "Change icon in settings work challenge" into udc-dev
2023-05-04 18:28:23 +00:00
Guangjie (Jerry) Shi
22776f3097
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: f3e24a0595
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I8bbf72d419885144d48d52c2458bf3322a18619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:15:26 +00:00
Xiaozhen Lin
78c986c89e
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: b0df220382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I9ea6f80037613fffafb396234da83172fc1bbb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:15:19 +00:00
Guangjie (Jerry) Shi
f3e24a0595
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: Ie4d4a6cdc9e94ce2143255e7f380ff7492abe825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:54:31 +00:00
Xiaozhen Lin
b0df220382
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I6706bf4e642f5a7dbfdd6ec6f328382644407b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:54:02 +00:00
Guangjie (Jerry) Shi
817ee8489f
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev
2023-05-04 17:33:03 +00:00
Xiaozhen Lin
be911918d0
Merge "Password clearing in Settings App" into udc-dev
2023-05-04 17:09:34 +00:00
Lucas Silva
100c550fda
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 86231b9ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: Iadceabdd679c5a66b5f46d9a517b839e98b2dc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:10:33 +00:00
TreeHugger Robot
2d3c8e3c37
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 1765b7d866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I46c9e01f6edfcf325cbbbc10d58735394d99660e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:09:56 +00:00
Jerry Shi
645ba04085
Modify the usage of setEnabledProvider to temporarily passed in empty
...
list.
Test: local test
Bug: 280492574
Change-Id: Id13aea203636527bcda745727aae417b2a8e289c
2023-05-04 08:57:43 -07:00
Lucas Silva
86231b9ec5
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I6bef5d5f5c4730c8832436b03242315aa4098f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:48:46 +00:00
Lucas Silva
d66bde103a
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev
2023-05-04 15:37:25 +00:00
TreeHugger Robot
1765b7d866
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I2f1bdfb9c562ecc3809376e1dfa471388cb5451a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:27:32 +00:00
Tetiana Meronyk
d3335c2785
Make user creation flow in a single dialog
...
Bug: 266548780
Test: atest UserDetailsSettingsTest
Change-Id: I3df846aa480b80321269ac7b9b8723912597aba4
2023-05-04 15:18:35 +00:00
TreeHugger Robot
3a2b8e81e5
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev
2023-05-04 14:57:36 +00:00
Vania Januar
fb7c1766a8
Replace placeholder icons with stylus icons
...
Bug: 250909304
Test: manual
Change-Id: I738a262ea0e3f03408c892adb758b99dd6d47386
2023-05-04 11:24:39 +00:00
Chaohui Wang
465a31a677
Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
am: e9540185f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670
Change-Id: I57ecb43e744f77a7d9ab048ae7c21a9f6da983f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 11:15:25 +00:00
Chaohui Wang
e9540185f1
Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670
Change-Id: I49f8c6cd6294cfb44d176f4dd79e7b4b8804b0ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 10:30:46 +00:00
Daniel Huang
bee2385875
Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e
am: da19d4a244
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401
Change-Id: I8b17885f3a88ddac4c5976798e9b402088ca4d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:51:42 +00:00
Treehugger Robot
f5fb93665a
Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b
am: c1607192c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565
Change-Id: I6982daebee674e83c876f65fb3e6b02ad447f578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:48:27 +00:00
Chaohui Wang
3f4820bdf1
Merge "Update for getSystemPackageNames" into udc-dev
2023-05-04 09:43:28 +00:00
Chaohui Wang
d87c018aec
Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4
am: d18cfc2bdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997
Change-Id: I658a0ccb9baed083db66784027fea82d4d8d25c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:42:12 +00:00
Hao Dong
f434a18379
Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24
am: 6e48b99a85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810
Change-Id: I36e5709b892658066e70628cb005fd7b165d86e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:41:40 +00:00