PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,284 Commits 1 Branch 0 Tags
eb73e3db2d07a543e7b061a12b1822c3bd5f11c2
Commit Graph

122284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
eb73e3db2d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077

Change-Id: Ib0c4fe784fe274b9ce9f7f31cd86b09a3c40da18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:05:01 +00:00
TreeHugger Robot
aa8a040424 Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: I4769684c969f0aaab4fa577a45b5e136343c566f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 20:54:18 +00:00
Bill Yi
301f60a2d2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: Ifeed0de4817c78c8b47f98f0f7d9e60874e51c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 20:54:04 +00:00
TreeHugger Robot
0848931c62 Merge changes from topic "tc_change_23050307_27" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-03 20:46:29 +00:00
Treehugger Robot
69dcb19d2d Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: I66b056b1e770fba5324eb7f828d253b1b71efd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:37:50 +00:00
Treehugger Robot
7244f3a0ae Merge "Update auto_rotate_summary string for different product" into udc-dev 2023-05-03 19:09:07 +00:00
David Gutierrez
e5e72d1729 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: Iefef809ceebb3c84cb311e4bfbdcf35a1c36b32e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 16:36:55 +00:00
Becca Hughes
1022918da5 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: I0f2e492e45177a5ac7e2e76dc1957f74d73f9781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 16:36:26 +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
Bill Yi
7951afa544 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: Ic53f6ad80da0a5e3f66bebd86e970ee2cce04f14
 2023-05-03 14:36:02 +00:00
Treehugger Robot
a785d94839 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: I0cfe6431ba87484cbe763185f0a4ebd3c285faae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 11:21:46 +00:00
Treehugger Robot
8060347ec6 Merge "Reducing slice requesting logging" into udc-dev 2023-05-03 10:37:24 +00:00
Edgar Wang
f8ee7bcdce 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: I498827f28fc3b6b89acbb0db0ae4fa96a3c33e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 09:57:19 +00:00
Edgar Wang
089217a19c Merge "Add new page enum for Account detail" into udc-dev 2023-05-03 09:49:11 +00:00
Edgar Wang
e416e27543 Update auto_rotate_summary string for different product 
Bug: 279769863
Test: presubmit
Change-Id: I98ceddc54bf5ea27cf862e96fe6358b3b885db0b
 2023-05-03 17:44:42 +08:00
Vania Januar
e686a77ec9 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: If6a483e5fd7b8140af0e09ead5a2e8426c41a7c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 09:35:57 +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
6c872cd4c6 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: I309334a3ac7848850cf8e76c2cee7e6bf5017a38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 07:31:16 +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
Wenhui Yang
22dd107a8a 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: I2ed86a2abfb152f80b53640e1efd6b3b570d6166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 06:28:19 +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
fd10333243 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: I03eb3a4db5d220ec48a00a19490794732f574658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 05:47:52 +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
13b49a9da0 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: I7bbe8f3aa976d7c1f1d1c387c0c01d7a551127bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:50:56 +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
Gil Cukierman
6a2f6960ab Merge "Enable null cipher toggle by default" into udc-dev 2023-05-02 23:11:40 +00:00
Diya Bera
47ccf9d776 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: Ia1452219dee8db6ed87dd78855f36cc83d4e185c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:48:46 +00:00
Becca Hughes
270b54d8a5 Fork autofill default app selection am: ddf359d0f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I6c4ee907752158c5b0f0c027053a991ab913bb8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:48:20 +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
bee80de992 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: I840453294516e478f898afc68b1c50481eb8f384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:04:19 +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
Bill Yi
6096cceb3c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If492025e729d55de4965fecb78a01471ee031f28
 2023-05-02 12:53:06 -07:00
Bill Yi
a68ce93fbe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I923b5604d38de2cf630a11d9dc7faca02311801a
 2023-05-02 12:39:11 -07: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
38929d38d3 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I6bd6317bcd6b65aae1fe1815aed7c1ffccd4400b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 17:30:12 +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
Treehugger Robot
a6c44f048b Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: Id5428a6b878d6d93ae9794f0e03c2815015924a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 14:57:30 +00:00
Treehugger Robot
d624141732 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev 2023-05-02 14:47:48 +00:00
Lucas Silva
69a8e59f33 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: I16d929bbf52b3b0d526875b8e2f5eab392af3c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 14:35:07 +00:00
Lucas Silva
9bd47de298 Merge "Fix colors for dreams settings according to new spec" into udc-dev 2023-05-02 14:00:22 +00:00
Ankita Vyas
b32d02c293 Add tests for config check in ClonedAppsPreferenceController 
Bug: 280071827
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=ClonedAppsPreferenceControllerTest
Change-Id: Id7c2e73bdb0c2af3e700b3620bde2fe77c47f3e6
 2023-05-02 12:03:42 +00:00
Chaohui Wang
49eebbcfe6 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: I0da6f5cb3bf8f959e2c0f3fa206b9998bc744290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 10:35:05 +00:00
Treehugger Robot
f6ba37e583 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: Iba95c1e9a8bae422384970ed6fb31dd1ef32c099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 10:30:14 +00:00