Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,835 Commits 1 Branch 0 Tags
9f39423cdcb20f05af216dee59cb1948c596f2a9
Commit Graph

48068 Commits

Author SHA1 Message Date
David Gutierrez
fb2b66075d Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: e156e0d96c am: 5cabf788b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391

Change-Id: Ifb9ca30b1fff360fe87ac78d0301c8b449eaab11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 18:02:08 +00:00
Becca Hughes
027c7213ab Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 6f600f1ddf am: 4326242066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: Ia03bc602567d208bec44d619882684a71077b6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 18:00:29 +00:00
David Gutierrez
e156e0d96c Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391

Change-Id: If571038f3ffb62336ad97e16e7030b14446b2c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 16:37:22 +00:00
Becca Hughes
6f600f1ddf Merge "Align settings with new mocks" into udc-dev am: 21733fa106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I563b006d6eccc442dd63a39bca10a8bd82eb690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 16:36:54 +00:00
David Gutierrez
570943637c Merge "Revert "Disable Settings large-screen optimization"" into udc-dev 2023-05-03 16:17:31 +00:00
Becca Hughes
21733fa106 Merge "Align settings with new mocks" into udc-dev 2023-05-03 16:14:12 +00:00
Priyanka Advani
77f76267d2 Revert "Disable Settings large-screen optimization" 
Revert submission 22926596-disable_large_screen_opt

Reason for revert: b/280606740

Reverted changes: /q/submissionid:22926596-disable_large_screen_opt

Change-Id: Ib918705206dc6b8bcbce21f83494d1108c6b8393
 2023-05-03 16:05:25 +00:00
Treehugger Robot
2c3844d8dd Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: 67215bb0db am: 714724ad09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I70dc3c8ebc684d47a7db315d09583c5e9466bfd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 12:35:15 +00:00
Treehugger Robot
714724ad09 Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: 67215bb0db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: Ic1de0f523a881a408f3c035932ff1dbc943fcf2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 11:58:59 +00:00
Treehugger Robot
7c92bd1fa4 Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I16952db9b2bc59a630e7f30fb42e26ba9ac2c90c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 11:17:36 +00:00
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
Treehugger Robot
8060347ec6 Merge "Reducing slice requesting logging" into udc-dev 2023-05-03 10:37:24 +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
Edgar Wang
9a976829ea Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: I0c777a2eeec7de02c0d11fc7bb5ff479bd21ad11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 10:14:38 +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
9c9b8afd26 Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: I01556c0442565babb72c2f879f109ee8e12ba277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 09:31:49 +00:00
Edgar Wang
fae664c79c Reducing slice requesting logging 
Bug: 253684322
Test: rebuild
Change-Id: If0e884875e09bd43b88f6b5f205ad450de488552
 2023-05-03 17:04:38 +08: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
Chaohui Wang
e548290d95 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: I475da5b3c533b950a466af49e4ea9af7b5e32622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 07:26:40 +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
Becca Hughes
b21df6c5fc Align settings with new mocks 
Test: ondevice
Bug: 278919696
Change-Id: I274126bce3616596c4a81dd3385f0844d8bdbf71
 2023-05-02 23:50:22 +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