Julia Reynolds
d1344b38dc
Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226
am: 80e1ca7c54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197
Change-Id: I80cbd2726cf3609a1f266e46b728b1d632ea8abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 08:35:03 +00:00
TreeHugger Robot
be40159399
[automerger skipped] Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev am: ea3f9f337e
am: 43415ece54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622
Change-Id: I2edef61193152600907617b029777585aa05cd47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 08:33:16 +00:00
Hugh Chen
0856c6d470
[automerger skipped] RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a
am: 2358afae79
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622
Change-Id: I1ef0e99276fe5fb7532858280af724656eb7311d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 08:33:15 +00:00
Treehugger Robot
4746c34212
[automerger skipped] Merge "Remove luyota from OWNERS." am: dcd3081158
am: d3a358910b
am: c50439e229
am: b7d0aaca3c
am: cf01938b05
-s ours
...
am skip reason: Merged-In I6a8139e569a31ea3983df0db970a36b841e646d4 with SHA-1 b4e07cdff4
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476
Change-Id: Id67f162b68d65e65ac2a21010a157cff83fdcbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 08:20:52 +00:00
Menghan Li
84374522ea
Merge "[Captioning preferences] Fix wrong color if default color selected"
2022-08-17 08:20:48 +00:00
Angela Wang
82140a2b73
Merge "Fix wrong visibility of link button in a11y tutorial dialog"
2022-08-17 07:38:46 +00:00
Weng Su
47b5595159
[automerger skipped] [RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID am: 911573f2e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19600288
Change-Id: I1ac1ffcc0af1e11d61361295231c0231d027ac63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 07:35:26 +00:00
TreeHugger Robot
bff59850d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ec740c30d5
-s ours am: f38346a569
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602319
Change-Id: I3900b3c1f912ad9f6ad8c053dc673303d5356cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 05:06:55 +00:00
Bill Yi
b48490b282
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2337f90b7e
-s ours am: 94e8fafbf2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602319
Change-Id: I8e33c72c5bb67a4fff0cec744280fa6464e6c2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 05:06:36 +00:00
Automerger Merge Worker
337f2656f3
Merge changes from topic "am-ff01169247bf4933aa25a2236b021ef2"
...
* changes:
Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: a5c64e1c4d
am: 1a16cd5b46
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours am: ff652e848d
-s ours am: dc2cfedb43
-s ours
2022-08-17 04:44:47 +00:00
Automerger Merge Worker
6eb7e9c7c3
Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: a5c64e1c4d
am: 1a16cd5b46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Icd7893516840acdf33c071cddff1bae5a40e1603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:42:56 +00:00
Automerger Merge Worker
844d11f975
Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: a5c64e1c4d
am: 1a16cd5b46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I05cf3b6b711aab8f219005cd10d0acb3845b51ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:42:55 +00:00
TreeHugger Robot
f152d3ebed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours am: ff652e848d
-s ours am: dc2cfedb43
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I48b4ec86764669523d882a8fdc433371be6d6360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:42:45 +00:00
TreeHugger Robot
16395184c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours am: ff652e848d
-s ours am: dc2cfedb43
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I1f95b012b36a1ee30053718ffa795c4b6d8fdcd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:42:44 +00:00
menghanli
0ed28e9fd0
[Captioning preferences] Fix wrong color if default color selected
...
Root cause: When the default captioning color was selected, the opacity became 100% and made the opacity preference is disabled. After changing to non-default color, the opacity preference becomes enabled, but it keeps showing cached opacity in opacity preference and the preview still shows the wrong color.
Solution: Cache the latest opacity if default captioning color was selected to show the correct opacity later.
Bug: 241308551
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I7712fb25d622da62d7fb2d017e33f94ef258941b
2022-08-17 12:00:43 +08:00
Automerger Merge Worker
8f49f14a23
Merge changes from topic "am-ae7375ba66c94a8f9d459c889d6bf72a" into tm-qpr-dev-plus-aosp am: 70b822f133
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Ic6f07a35106da76270556bdd4c3c0d03e6751f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 02:51:26 +00:00
TreeHugger Robot
ff2491c0f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours am: 1215a5dff3
-s ours am: 6093732898
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Ibec493b378a824ac34f05c4195917c82b67b2247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 02:51:17 +00:00
TreeHugger Robot
e747d74928
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: fb1a655d43
-s ours am: 3242d750df
-s ours am: 5637ebfb5d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I7a3c9142a19dddbd197f8b574ca155a3398b5043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 02:49:46 +00:00
Bill Yi
0113f785b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: fdc0cac006
-s ours am: 7b7035e940
-s ours am: 12e87dfaa8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I56e89af6132900355d83035f5fcd034200c52f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 02:49:39 +00:00
Bill Yi
ca7d41676a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours am: 7e6afc5894
-s ours am: 16023d11c8
-s ours am: eccbecf4f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I205b7f3686a09d34faefd34cc46dcd66bef97f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 02:49:27 +00:00
Julia Reynolds
80e1ca7c54
Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197
Change-Id: Iffe89254913fab91b02e3e5db18939912204de40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 19:55:23 +00:00
Julia Reynolds
dbaa419226
Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev
2022-08-16 17:07:18 +00:00
Han Xu
b4be0a3c5d
Merge "Add BROWSABLE for most Settings Activities"
2022-08-16 11:24:41 +00:00
Han Xu
b7d1077ada
Add BROWSABLE for most Settings Activities
...
so they can be opened via webpage link.
Bug: 238966547
Test: manual
Change-Id: Ic52895ce0577246a2bbf9536fce1e10ab41f7605
2022-08-16 13:02:57 +08:00
TreeHugger Robot
43415ece54
Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev am: ea3f9f337e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622
Change-Id: Ica9d66e5ddc85ea049fe170a9b9e245e07c72542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 04:37:08 +00:00
Hugh Chen
2358afae79
RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622
Change-Id: I3dd165a645a1bb63613d541453e32d7c943df776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 04:37:06 +00:00
Treehugger Robot
cf01938b05
Merge "Remove luyota from OWNERS." am: dcd3081158
am: d3a358910b
am: c50439e229
am: b7d0aaca3c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476
Change-Id: I4793c21cdd3ed46c0ce7e5680b41e4470d14ac27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 04:28:01 +00:00
TreeHugger Robot
ea3f9f337e
Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev
2022-08-16 04:03:12 +00:00
Treehugger Robot
b7d0aaca3c
Merge "Remove luyota from OWNERS." am: dcd3081158
am: d3a358910b
am: c50439e229
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476
Change-Id: Ie2f8b6160d32786a9067d1211c5bfa199d1281d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 03:23:35 +00:00
Jack Yu
f8b664e31f
Only primary user is allowed to control secure nfc
...
Bug: 238298970
Test: manual
Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313
2022-08-16 02:59:18 +00:00
Treehugger Robot
c50439e229
Merge "Remove luyota from OWNERS." am: dcd3081158
am: d3a358910b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476
Change-Id: I4e704eb49210afd13f7c00841ad6b242988a3e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 02:57:05 +00:00
Treehugger Robot
d3a358910b
Merge "Remove luyota from OWNERS." am: dcd3081158
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476
Change-Id: Ibc32c7ab34a3006acca4f0edbb38645d2c6ecf9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 02:31:16 +00:00
Treehugger Robot
dcd3081158
Merge "Remove luyota from OWNERS."
2022-08-16 01:53:34 +00:00
Julia Reynolds
2a61b3656b
Update Bridged app link when NLS access changes
...
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
2022-08-15 17:50:49 +00:00
Weng Su
911573f2e1
[RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
...
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication
- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication
- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID
Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
(cherry picked from commit 2732be59e5
)
2022-08-15 13:31:52 +00:00
TreeHugger Robot
aef0cde406
Merge "Fix b/242252080: Add padding space on the top of the battery chart"
2022-08-15 10:24:26 +00:00
Zaiyue Xue
c931670a99
Fix b/242252080: Add padding space on the top of the battery chart
...
screenshot: https://screenshot.googleplex.com/9XU9Yiwv9YAVd46.png
Bug: 242252080
Test: manual
Change-Id: I81730168337b311600a12b844753848c21105d46
2022-08-15 16:19:19 +08:00
Zaiyue Xue
7384298061
Fix b/242254055 Battery usage initial screen improvements (long data loading time)
...
screen record with forcing 5s loading data: https://drive.google.com/file/d/1qIkY9U55oF8ktNqiJtxMW7K8sVuJDgTa/view?usp=sharing&resourcekey=0-BJTVh6GcvpXeTqwOQzmzYw
Bug: 242254055
Test: manual
Change-Id: Ic6a907ddc4e932ef0256f96556667cd681ef0ebc
2022-08-15 15:52:51 +08:00
Angela Wang
67efcacbc1
Fix wrong visibility of link button in a11y tutorial dialog
...
Root cause: the visibility of link button is not correctly set due to
the onPageSelected callback isn't called when the first page shows
Solution: Manually set the visibility of link button according to the
first tutirial page type when dialog is shown
Bug: 242141428
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I33ed07bc7ae39d96baeeed85771c5f13e00ebf44
2022-08-15 06:01:17 +00:00
Bill Yi
b935f1e10b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-08-15 03:52:22 +00:00
Bill Yi
0e7e9c61c6
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-08-15 03:52:22 +00:00
TreeHugger Robot
f38346a569
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ec740c30d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602319
Change-Id: Idec6bc26eda8a7a2542503f351264dfb9eda0720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-14 21:18:13 +00:00
Bill Yi
94e8fafbf2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2337f90b7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602319
Change-Id: Ie9f2f05c38f72f6ad035f3b2102b065ac4e9bb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-14 21:17:47 +00:00
TreeHugger Robot
ec740c30d5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-14 20:53:24 +00:00
Automerger Merge Worker
1a16cd5b46
Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: a5c64e1c4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: If9e522e1a986e16dd573b8211c243b98df7b0cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:18:12 +00:00
TreeHugger Robot
dc2cfedb43
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours am: ff652e848d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I4ef5c97ffe12a5707b1f0c7a70207084e8fb1376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:17:59 +00:00
Automerger Merge Worker
70b822f133
Merge changes from topic "am-ae7375ba66c94a8f9d459c889d6bf72a" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours am: 1215a5dff3
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: 0e2272c6f6
-s ours am: 6e1b3b15d6
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours am: 89ae91f7cd
-s ours am: 76812fbeb1
-s ours
2022-08-13 05:15:16 +00:00
TreeHugger Robot
5637ebfb5d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: fb1a655d43
-s ours am: 3242d750df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I467c80b142a6a6253da522e27ea857bbc8a52c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:14:08 +00:00
Bill Yi
12e87dfaa8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: fdc0cac006
-s ours am: 7b7035e940
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I905b0b4da6c0ed5044dbbdf7e2f1ae700364eeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:13:57 +00:00
TreeHugger Robot
6093732898
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours am: 1215a5dff3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Iaeb94c4a9d560c288748ad7f4f0a8bc241a7ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:13:48 +00:00