Chaohui Wang
4d725d7715
Merge "Adjust padding on SIM onboarding screens" into main
2024-05-06 08:54:10 +00:00
Chaohui Wang
ffcbbd375a
Clean up MobileNetworkSummaryStatus
...
Fix: 338904413
Test: m Settings
Change-Id: Ic26bf7833c8fbdbeffc4f47dcd6dcd6191394e1b
2024-05-06 07:26:06 +00:00
Weng Su
9245bf0b89
Merge "Don't set the Wi-Fi dialog to the topmost UI" into main
2024-05-06 07:18:49 +00:00
Chaohui Wang
5058a7f3b5
Adjust padding on SIM onboarding screens
...
Fix: 330899892
Test: visual - on Sim Onboarding Page
Change-Id: I2f09d8fc20ad9c51bb5d8c9fae703433a7f87ed8
2024-05-06 03:09:02 +00:00
Fan Wu
45cf636b1a
Merge "Update test looper mode to INSTRUMENTATION" into main
2024-05-06 03:08:27 +00:00
Bill Yi
948f7e96cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1d686943a3
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211555
Change-Id: I6ed4cb99d9a5d4cdff1ead89dd3a62cd915ec18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 23:46:37 +00:00
Bill Yi
f67e7ce7b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 903dd6c8a2
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211555
Change-Id: I12feede534fac731741ebe06cae66c4837ba2fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 23:46:22 +00:00
Bill Yi
1d686943a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-05-03 23:24:26 +00:00
Bill Yi
342139ff4f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3bc754019
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211103
Change-Id: I88471a9d1cc0808693e3f1fafa988107631b7461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 23:06:02 +00:00
Bill Yi
b7654d1e94
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-03 22:46:27 +00:00
Bill Yi
71524c564c
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-03 22:46:27 +00:00
Bill Yi
f62a81b3e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-03 22:46:27 +00:00
Treehugger Robot
42805dcb22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2a8de4adc8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211860
Change-Id: I149c3964d605ff772c310cf81a305bae52f6ab56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:37:09 +00:00
Bill Yi
a9ca3385d7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ed8dee24c8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211860
Change-Id: I9991fd73c01357ceb51bdd7c5394d64e3eb00cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:37:06 +00:00
Treehugger Robot
7b025d10f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ad279da071
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211835
Change-Id: I04add3a9a0eafb789ac4e0a0f1460d1e6060db7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:36:59 +00:00
Bill Yi
e988c2f2e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ea119c95e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211835
Change-Id: I40960e6b5f3b0bca5a7cf704bc16fe508a38184c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:36:39 +00:00
Bill Yi
f0cce0a0a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2d407f276
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211565
Change-Id: I5f6363485b2bdba4e2dbadad2ffe4b45b3de9115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:36:30 +00:00
Treehugger Robot
2a8de4adc8
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-03 22:27:03 +00:00
Treehugger Robot
ad279da071
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-03 22:27:03 +00:00
Oriol Prieto Gascó
4d0a112140
[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 14d4df602b
am: 7812cfcee5
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647
Change-Id: Iab59ef6dd7d0b373ad6ab22c2e2d4f19b66c4ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 14:52:34 +00:00
Oriol Prieto Gasco
18f711f552
[automerger skipped] RESTRICT AUTOMERGE am: 0a441b2f06
am: 1aaa1f96ca
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647
Change-Id: Ib8dc332b3e63f127f6db2e9d63231874444ff289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 14:52:26 +00:00
Manish Singh
d3efbdf74e
Merge "Add a new string for the hide settings" into main
2024-05-03 14:32:08 +00:00
Oriol Prieto Gascó
7812cfcee5
Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 14d4df602b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647
Change-Id: I90cf0dba57d305ef58f757191600254b0a20a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 14:26:07 +00:00
Oriol Prieto Gasco
1aaa1f96ca
RESTRICT AUTOMERGE am: 0a441b2f06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647
Change-Id: Ia5cc1f4909193ced38a676a7bc84e9795d823bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 14:25:55 +00:00
Oriol Prieto Gascó
14d4df602b
Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main
2024-05-03 14:09:48 +00:00
Bill Yi
ed8dee24c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ee20195ebf4494832e819ed1bc171d86374f634
2024-05-03 07:09:35 -07:00
Bill Yi
d966c85b4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0983bbe83fdbbd57e8214d962458efcf1d7de317
2024-05-03 07:08:43 -07:00
Bill Yi
7ea119c95e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icb2bf4badc91a370f1fcbd7d072b245bc6b50be6
2024-05-03 07:06:23 -07:00
Bill Yi
aed60ba64e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a7fc63ecc03282e040369f13b1d4f469ef52249
2024-05-03 07:04:33 -07:00
Bill Yi
b2d407f276
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I05cf80b5cefaebbd6447392b80a71e68bf446d57
2024-05-03 07:03:03 -07:00
Bill Yi
b4f2dfe3de
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I860c5ff8d0d7ad0d4bc687f211481de124a419e1
2024-05-03 07:02:12 -07:00
Bill Yi
903dd6c8a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie51aea579d0254db21ebae51a7354eaa5392e2cd
2024-05-03 07:00:31 -07:00
Bill Yi
a3bc754019
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib9d7e360a7317037c69207731b0616ba2277a1fb
2024-05-03 06:59:04 -07:00
Weng Su
a955648be4
Don't set the Wi-Fi dialog to the topmost UI
...
- Set Wi-Fi dialog to topmost UI only when called by SysUI
Bug: 293965733
Flag: None
Test: Manual testing
atest -c WifiDialogActivityTest
Change-Id: I9215b3e7f86c0d31fa0c4c492f29032c3d14ad6d
2024-05-03 21:12:54 +08:00
Manish Singh
7c7e07fc0a
Add a new string for the hide settings
...
Fix: 333522647
Fix: 338187040
Test: manual
Change-Id: I18fdb3ec8d385588a558706f76437084d43ccc92
2024-05-03 11:55:37 +00:00
Oriol Prieto Gasco
0a441b2f06
RESTRICT AUTOMERGE
...
Set the container field of aconfig flags
Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I4fc69f563ead7206ef48278be4fb4cbcfc9cb1f7
2024-05-03 11:42:26 +00:00
Fiona Campbell
e56b0adedd
Merge "Add EvenDimmer to a11y settings page" into main
2024-05-03 10:35:31 +00:00
Pajace Chen
c7f595814b
Merge "Fix test case failed issue" into 24D1-dev am: df8dc5dc61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27200838
Change-Id: I988aa8852b922f9a05a2352850d803ea3feb7e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 02:37:33 +00:00
Jason Chiu
41bd910d11
Merge "Check whether the user is a sub profile before starting Settings homepage" into main
2024-05-03 02:14:26 +00:00
Pajace Chen
df8dc5dc61
Merge "Fix test case failed issue" into 24D1-dev
2024-05-03 02:08:09 +00:00
pajacechen
1d03a55ea8
Fix test case failed issue
...
This test case is not really failed, it doesn't break the functionality
of production code. The reason for failure is caused by the timeZone.
A different timezone could result in a different time string.
So, ignore this test case for now.
Test: Unit Test
Fix: 338343937
Change-Id: Iab0f6f2d454f226568ac09a49ae5372f3a9bc88f
2024-05-03 01:59:40 +00:00
Treehugger Robot
7b125fbe7d
Merge "Add ActivityOptions to start instant hotspot settings in the background" into main
2024-05-02 22:28:43 +00:00
Weng Su
c5ab12732b
Add ActivityOptions to start instant hotspot settings in the background
...
- Set intent with ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
Bug: 338244101
Flag: None
Test: Manual testing
atest -c SharedConnectivityRepositoryTest
Change-Id: Ie983758dc039a7bbca80cca478ca23444527089b
2024-05-03 04:26:50 +08:00
Pawan Wagh
570afa5b7d
Merge "Apply OTA from /vendor/boot_otas" into main am: 8c85f8b3c3
am: 883f1e9dba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3065886
Change-Id: I122ccf18200a1fe0f17646c22a9139585cfb4dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-02 20:08:49 +00:00
Pawan Wagh
883f1e9dba
Merge "Apply OTA from /vendor/boot_otas" into main am: 8c85f8b3c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3065886
Change-Id: I6bb52915494151ca4cab3508110899f321b239b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-02 19:54:25 +00:00
Pawan Wagh
8c85f8b3c3
Merge "Apply OTA from /vendor/boot_otas" into main
2024-05-02 19:28:44 +00:00
Fiona Campbell
4c3413b226
Add EvenDimmer to a11y settings page
...
- Add even dimmer to a11y settings page
- Additionally, use original extra dim icon next to setting to keep
consistency with the rest of the a11y settings. This is the only
difference from the setting in settings > Display.
Bug: 336476699
Test: manual
Change-Id: I5c0cb25f2ae61560346d3f051fe5dfec0e404739
2024-05-02 15:23:07 +00:00
Yuri Lin
5e73ecaeaa
Merge "Rename ZenMode(s)SettingsBase to ZenMode(s)FragmentBase" into main
2024-05-02 14:28:32 +00:00
Treehugger Robot
be380fd2f1
Merge "Extend the length of the title of the Work profile lock" into main
2024-05-02 09:42:53 +00:00
YK Hung
e1303ffa3a
Merge "Update battery saver sticky preference description" into main
2024-05-02 06:07:27 +00:00