Commit Graph

122862 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Treehugger Robot
8060347ec6 Merge "Reducing slice requesting logging" into udc-dev 2023-05-03 10:37:24 +00:00
Edgar Wang
8efc1616e6 Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 9a976829ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

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

Change-Id: I70d1ec85945b207c4e619c41bdb3d2970b3c950f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 10:18:50 +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
2c1ad2142f 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: Ibd7bcc5f3bc4c2abc79f30c8b4a93cd2503167d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 09:57:21 +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
3f449e0c49 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: Id38d54a83868152b6267b83b5292d9e251fb8381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 09:35:59 +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
14cefd4c22 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: e548290d95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: Ia95b3cbbbdabc15df6da3fdaf6737ddf1189b3ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:13:15 +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
a90bbde69f 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: Iaf2a725e7dea566fe1bff5dd805598587482b1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:30:56 +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
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
c4bc904c00 Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 4e4941480f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: Ied6bcd205ea1d88a36428572b34e27f9dab21fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:43:48 +00:00
Wenhui Yang
bae452979c Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 2755f17587
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I062a429e27310066b8e23e4c078b958ed07a7247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:31:47 +00:00
Charles Chen
a278f65bc4 Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: f8d75358ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: Iadb0dddd01881e456ab3d627e13bc9befae49a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:30:44 +00:00
Wenhui Yang
4e4941480f 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: I0a7131567f578e045d20bc92fa50b1e4fb3f85cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:28:24 +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
2258dd83cd 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: I38c795e9729694e7720387dde7e8c2d5ece5e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 05:48:14 +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