Commit Graph

125771 Commits

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

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

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

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

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

Change-Id: I0fdd0a74a86dcf7a80948bffa5024f53cdeaca47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:20:46 +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
David Gutierrez
6a8a9492d7 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: I71a855eb9c082e8c32d6a56c07722c08984b019e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:37:22 +00:00
Becca Hughes
454cfbf2cc 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: I2a423b8a0a96ebcc51f04f0603e73e4f2fd24bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:36:56 +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
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
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
danielwbhuang
0b79c92348 [Fixed] Reverse scrolling setting is reversed
If useTouchpadNaturalScrolling is false, "Reverse scrolling" should be on.

[The API value]
useTouchpadNaturalScrolling: false

[The expected UX behavior]
Reverse scrolling: on
fingers upward, scroll up, content moves down

The description of "useTouchpadNaturalScrolling":
Returns true if moving two fingers upwards on the touchpad should scroll down, which is known as natural scrolling.

The description of "Reverse scrolling":
Content moves up when you scroll down.

Bug: 280047007
Test: manual and passed atest TrackpadReverseScrollingPreferenceControllerTest
Change-Id: Ia5e30fa14b599ddcffae99005114f10412ccad3c
2023-05-03 23:59:55 +08:00
Bill Yi
7ac2a3f7e4 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5e4956845b
Blank merge reason: commit message contains skip directive

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

Change-Id: I234f707dcd72c3c28ff856de48b48e14fcfc6067
2023-05-03 14:54:50 +00:00
Bill Yi
e6d51e5378 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c 2p: e28505b1f9
Blank merge reason: commit message contains skip directive

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

Change-Id: I4862afc62e1ea42bb54d6d53fbdf63b7dcec91eb
2023-05-03 14:42:16 +00:00
Bill Yi
56b01ab110 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff 2p: 98c8d85c26
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib76cee01fd90bd1a9c70e2231bb2ef31c1506573
2023-05-03 14:42:09 +00:00
Bill Yi
98c8d85c26 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff
Blank merge reason: commit message contains skip directive

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

Change-Id: I53c99ead2dccfee605d40413f971d4fb5a938854
2023-05-03 14:41:38 +00:00
Bill Yi
e28505b1f9 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
Blank merge reason: commit message contains skip directive

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

Change-Id: Iaeee5cf9b0ea850439b39487d4edaf77fa7e89ed
2023-05-03 14:39:38 +00:00
Bill Yi
aa9489179b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
Blank merge reason: commit message contains skip directive

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

Change-Id: Id55759bbc4a708d789a8b83421a3d82ea24b8d32
2023-05-03 14:36:07 +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
061d6a770c Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: 67215bb0db am: 1b72fd9f3c am: 875b7ad023
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

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

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

Change-Id: Ia8f730365c545b0b898305980485f294f5675121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 13:07:59 +00:00
Treehugger Robot
875b7ad023 Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: 67215bb0db am: 1b72fd9f3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I5f3c166408ed42229500d0d13db6a4e531e7990d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 12:45:53 +00:00
danielwbhuang
bd2d0de0b3 Fix testNonIndexableKeys_existInXmlLayout
This test is for LanguageAndInputSettings UI.
Hence, we should set flag "SETTINGS_NEW_KEYBOARD_UI" to false

Bug: 280018738
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=LanguageAndInputSettingsTest
Change-Id: Ida91a23bb576c81f9618406d54c1d892b23eb4fa
2023-05-03 20:40:53 +08:00
Oli Thompson
6d16151639 Change icon in settings work challenge
Screenshots in bug

Test: manually tested
Bug: 279559156
Change-Id: If3c9415db476f0ca0d26e74311e7bcd8d7e33dbb
2023-05-03 12:39:27 +00:00
Treehugger Robot
bb51172480 Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: 7c92bd1fa4 am: dc7c6c2a47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I3cff41fe60121bf6b8e4d3c698f1a85fdc3fab97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 12:35:28 +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
dc7c6c2a47 Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: 7c92bd1fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I3d9e3c296e43c33e17e877557746e2eb999ce2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 12:03:24 +00:00
Treehugger Robot
1b72fd9f3c 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: I0e7b334b914601a10e7adb452c29eccaeb01ece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 12:02:52 +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
86a449749a Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: a785d94839
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I4b8cde8da24defe54fc7e78ad5f976e90b3f40fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:58:50 +00:00
Edgar Wang
9b3a3a7400 Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 2c1ad2142f am: f6b49a0204 am: 4b64c8421f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: Ibba67b51eb70dba9219bf458ee5a2d12be6437c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:45:37 +00:00
Vania Januar
97f69deef5 Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 3f449e0c49 am: c584bfae60 am: a74bcef17c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: I849224e5809824452ae12de8b5e6a497c201dd3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:45:18 +00:00
Edgar Wang
51f2d11216 Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 9a976829ea am: 8efc1616e6 am: a985eb0d8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: I18d750fd1ac0b80f70b4e8b30ddaba61fffd63f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:44:24 +00:00
Vania Januar
54c5f3d59d Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 9c9b8afd26 am: 1d42b289f7 am: 9a34f81365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: Ieb2c63014c8978cccb3bc463310c27e2b8fefbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:44:03 +00:00
Edgar Wang
201ec0ef65 Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 2c1ad2142f am: 471f966040 am: 76031094e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: I0acab8f99a1020bb3936c822b3d2199592137318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:43:10 +00:00
Vania Januar
4eac7fc5ef Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 3f449e0c49 am: 0313782cb4 am: 94b7d34013
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: I7d9ba2c612db10fbe52f88d2c405735561abe04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:42:56 +00:00
Treehugger Robot
67215bb0db 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: I1e231a4a909a1fa48034107e62a62f4ef75421ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:21:47 +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
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
4b64c8421f Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 2c1ad2142f am: f6b49a0204
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: I8ab4aaebcd395306854ff4705b3a8738ede95d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:01:40 +00:00
Vania Januar
a74bcef17c Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 3f449e0c49 am: c584bfae60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: I3fa6bac9b78427a04f77be1fd20fb9cb470579eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:01:27 +00:00
Edgar Wang
a985eb0d8e Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 9a976829ea am: 8efc1616e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: Ia8d0adcb7fc40625118dbd235f508bd1252767ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 10:49:19 +00:00
Vania Januar
9a34f81365 Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 9c9b8afd26 am: 1d42b289f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: If5abb607fbbc925a052f683d60b51fd9395b87ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 10:49:10 +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