Edgar Wang
76031094e5
Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 2c1ad2142f am: 471f966040
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436
Change-Id: Ibdc3a3cae17efd09d9f44956b592cb9a789cc4ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:48:26 +00:00
Vania Januar
94b7d34013
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 3f449e0c49 am: 0313782cb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: I07f087b366618b4eec3aa77a9217ea5eb0fbb9fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:48:13 +00:00
Edgar Wang
471f966040
Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 2c1ad2142f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436
Change-Id: I1405e71a41f5e6dc2a976da1de146773ac6b6024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:14:42 +00:00
Vania Januar
0313782cb4
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 3f449e0c49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: Id14704595c6433441d0e584519dadff265a41007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:13:59 +00:00
Edgar Wang
089217a19c
Merge "Add new page enum for Account detail" into udc-dev
2023-05-03 09:49:11 +00:00
Vania Januar
e78b1f377e
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev
2023-05-03 09:00:56 +00:00
Chaohui Wang
5b9d15074a
Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: a90bbde69f am: c2fc133cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558
Change-Id: Ibfb703eb136ac170f250267f3d2a397af4f9aa1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 08:53:23 +00:00
Chaohui Wang
c2fc133cc2
Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: a90bbde69f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558
Change-Id: I627724bf83f86f57b13f16e20db6905911eaa071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 08:09:14 +00:00
Wenhui Yang
90be9e8b21
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 2755f17587 am: bae452979c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: I1be4b55eddc5db23677431f87b7634ad0847af80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 07:10:11 +00:00
Charles Chen
29af9eb40a
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd am: fd34dac5ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: Iba244853e17971998b61ff6b9ff8e62ecccaa6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 07:07:22 +00:00
Chaohui Wang
d66335ae1c
Merge "Use correct App info screen's trash can icon" into udc-dev
2023-05-03 07:01:57 +00:00
Charles Chen
fd34dac5ea
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: I9380b30d997f7e313d86af542631a4e22f0cb104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:27:08 +00:00
Wenhui Yang
2755f17587
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: I9c48161c5f1a85251daee07af18f8d1f128c468c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:24:02 +00:00
Wenhui Yang
25de3b2b9c
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev
2023-05-03 06:11:23 +00:00
Charles Chen
f8d75358ea
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: If45c374a6db9f383dad8f0e169f083e6acef9a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 05:48:59 +00:00
Charles Chen
cb5a240361
Merge "Disable Settings large-screen optimization" into udc-dev
2023-05-03 05:44:08 +00:00
Edgar Wang
b663f17d31
Add new page enum for Account detail
...
Bug: 260054568
Test: rebuild
Change-Id: I332bebf4f4ce725759860f937f50c8a6f21d8648
2023-05-03 13:06:28 +08:00
Chaohui Wang
2aca9d40f8
Use correct App info screen's trash can icon
...
Fix: 280120259
Test: Visual
Change-Id: I954c344c3f5fdd256de7519f1534c982c084a521
2023-05-03 11:59:43 +08:00
Gil Cukierman
f4755a4649
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: dd5fef516d am: 68251aefed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: I90f0961312c163e19851d5f6a962edccb9ffa4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:14:19 +00:00
Diya Bera
82b093054e
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc am: 2f9df85d1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: Ib10ed5f2b4e08bf6e09d4cdc94778f5ff857988f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:12:44 +00:00
Becca Hughes
dbee9f7670
Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: b66c783024
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: Iffbc0657ff72e99eaf4d4b09f083e1acb7326e65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:11:21 +00:00
Gil Cukierman
dd5fef516d
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: I4d39e88aca6e31c3e897a0d16ec45124906d63cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:51:30 +00:00
Diya Bera
2f9df85d1a
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I347b01c9dd6ef0fe73b4cd2052060480697266b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:28:04 +00:00
Becca Hughes
b66c783024
Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I5c3133f66d3c0245b408946fdcbeffa9f4f91018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:27:42 +00:00
Gil Cukierman
6a2f6960ab
Merge "Enable null cipher toggle by default" into udc-dev
2023-05-02 23:11:40 +00:00
Diya Bera
d4066f5f7a
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I9e5379823d02eed4848e033eb72bf163456a4f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:49:25 +00:00
Becca Hughes
476e6769eb
Fork autofill default app selection am: ddf359d0f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I52df2333cec85e89f24940c7a463a5ce57f50655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:47:57 +00:00
Diya Bera
7dd5f5e156
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev
2023-05-02 22:34:09 +00:00
Becca Hughes
58cc818200
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c am: 1ac2d51e73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: Iceef860c979f74c2b3ee2d9ae774202964262164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:29:28 +00:00
Becca Hughes
1ac2d51e73
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I1bbab46eacf48ee4ce8aa9f176017177eab80c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 21:42:54 +00:00
Becca Hughes
b31c4909db
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I6a7611e31c835d41eb53a1160bd7d7aa68b9f0ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 21:00:01 +00:00
Becca Hughes
ddf359d0f8
Fork autofill default app selection
...
We are merging the default app selection for autofill
with credman so this forks the existing UI (so we can
flag it off).
Test: ondevice
Bug: 278919696
Change-Id: I96bcf1ff86b169a182b9974f7384c45b474c3d5d
2023-05-02 20:31:14 +00:00
Becca Hughes
99f45dd59b
Merge "Add combined provider class that manages new settings UI" into udc-dev
2023-05-02 20:16:32 +00:00
Ioana Alexandru
a0458d4301
Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 am: 11c63e7479
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539
Change-Id: I8ffe4113904c38aafc4fb2accd537a93bc21f00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 18:51:28 +00:00
Ioana Alexandru
11c63e7479
Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539
Change-Id: I95477a582ab7e7e1424dc67814aa0c4dba05bab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 18:10:04 +00:00
Becca Hughes
ea03b3e2a0
Add combined provider class that manages new settings UI
...
Example of how to use: https://paste.googleplex.com/6523798525313024
Test: make
Bug: 278919696
Change-Id: I934a5f6d02b50f8c97bda6d997902a42ff88e26f
2023-05-02 17:37:44 +00:00
Ioana Alexandru
ca769153a0
Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539
Change-Id: Idb7f1807b789a1050e31e137f81631fc7f39f8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 17:28:49 +00:00
Ioana Alexandru
e0a4a343c4
Fix AmbientDisplayAlwaysOn isSliceable.
...
I changed this method to return true in ag/22761786 thinking that it was
necessary (as per the example at
https://g3doc.corp.google.com/company/teams/apps-android-settings/howto/settings_slices.md#preference-controller ),
but this breaks a test, so I'm rolling back that part of the change.
Fix: 279881487
Test: presubmit
Change-Id: I87716a0daf5face9a79f98353b49ea2166226279
2023-05-02 16:52:26 +00:00
Diya Bera
9814931fd8
Remove "Try again" from fingerprint error dialog
...
Test: Manual (Start enrollment and don't complete it for 10 minutes;
observe the dialog; screenshot in bug)
Bug: 279648300
Change-Id: I88280e3a5d47735285d89174ad8bcb0da8d39282
2023-05-02 09:51:36 -07:00
Chaohui Wang
507be6a484
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 am: 719b2f1f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: If9b754e56b5f09c323f4dda804d47f300ed1fc66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 15:00:47 +00:00
Treehugger Robot
92124f26b6
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 am: aa354d5666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: Icac7ab915fd8da8cead98dbfe10cd7ef904f7e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:57:43 +00:00
Chaohui Wang
719b2f1f60
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: Icdb02006b5c1370bf1e6a754b5f557309ab07def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:27:56 +00:00
Treehugger Robot
aa354d5666
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I0f8ba89b5d6d2968b4770591218a786bdac00e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 13:58:28 +00:00
George
81fe8bb38e
Fork the NfcTagAppsSettings page to SPA am: 750cd809fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22939919
Change-Id: Ia6b29eaaec791ba54797513905b302289c3d4b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 12:52:03 +00:00
Chaohui Wang
0f915a4c35
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: Ic155aa679959e8c8d49092869113cf24aa49c148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:39:17 +00:00
Treehugger Robot
648266e8d7
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I26d8b679b5783c6b86128ec9ac91a54592854f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:19:39 +00:00
George
750cd809fe
Fork the NfcTagAppsSettings page to SPA
...
The page is located at "Apps > Special app access > Nfc launch"
Bug: 267404181
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NfcTagAppsPreferenceControllerTest
Change-Id: I9fb4a68634f0b6f20d5f87601c1175ced33daad5
2023-05-02 10:15:53 +00:00
Chaohui Wang
bf9ba71cba
Merge "Fix Data Saver page crashed when rotate" into udc-dev
2023-05-02 09:50:17 +00:00
Vania Januar
a1af049378
Guard against null input device in StylusDeviceUpdater
...
Bug: 279170207
Test: StylusDeviceUpdaterTest
Change-Id: Ib4a3f12eaceb87370c800a9dc7eda819c706cd3b
2023-05-02 09:36:43 +00:00
Charles Chen
1815ba7828
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.
This CL also rename isActivityEmbeddingEnabled to
shouldEnableLargeScreenOptimization because the method
may report false even if the device supports the feature
but Settings app doesn't for performance concern.
Bug: 267725145
Bug: 279461170
Test: Build, perf metrics
Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests
Test: atest SettingsMultiPaneDeepLinkTest.java
Change-Id: I38e8c62a61a344eb7a5cbfd1cd2c2137357d1a87
2023-05-02 14:16:22 +08:00