Xin Li
070c045837
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c27f705eb7
-s ours
...
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2186878
Change-Id: Ie78dba9efd64ed87c36577b4f705fb6eb102ebab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:39:30 +00:00
Xin Li
98c2ff5b3b
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca561
-s ours
...
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2186878
Change-Id: I93435f94befbf09d289979ac46e97ca0cf83d9f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:39:27 +00:00
Chloris Kuo
41e650c223
Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev am: 4d4bf61c4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19641993
Change-Id: I11f45faad393404ba00d464d7caea674360428ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 20:26:21 +00:00
Chloris Kuo
4d4bf61c4c
Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev
2022-08-16 20:05:46 +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
Xin Li
c27f705eb7
Merge "DO NOT MERGE - Merge Android 13"
2022-08-16 19:11:14 +00:00
Chloris Kuo
359929732d
Fix settings crash when enhanced notification shown in search results
...
init NotificationBackend in constructor and set isSliceable to false in
search result since the NAS enabling logic is required and is in the
parent fragment ConfigureNotificationSettings.
Bug: 237251075
Test: test manually on device
Change-Id: I9082d6eda27784cf378a0d06304b5fc1e2ae6d7f
(cherry picked from commit 26ce9a98f0
)
2022-08-16 17:08:17 +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
Xin Li
48b65ca561
DO NOT MERGE - Merge Android 13
...
Bug: 242648940
Merged-In: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Change-Id: I7d823fd36c6d9395a86ec0757f55daf644193a01
2022-08-15 22:04:37 -07: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
Tsung-Mao Fang
d2c372450c
Wi-Fi panel doesn't need to check permission
...
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.
This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.
In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).
Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998
Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-16 03:59:56 +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
Bill Yi
eccbecf4f8
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: Ia8b6c3f55427aaa8649183c4b48307eb2889c246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:13:48 +00:00
Bill Yi
5b9d3c21a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: 0e2272c6f6
-s ours am: 6e1b3b15d6
-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: Ib3d4d17e2ecc9fe6f88fff3f8cf0dfc0f9f58d8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:13:38 +00:00
Bill Yi
a386abb37a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours am: 89ae91f7cd
-s ours am: 76812fbeb1
-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: I5857d1068586da61a11942ed39976de419bd9f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:13:34 +00:00
Automerger Merge Worker
a5c64e1c4d
Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-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
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: 0e2272c6f6
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours am: 89ae91f7cd
-s ours
2022-08-13 04:59:21 +00:00
TreeHugger Robot
3242d750df
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Ifa816686a55abeeba8cde8df5f2b4955c5e383c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:58:29 +00:00
Bill Yi
7b7035e940
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: fdc0cac006
-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: Ida5272e4d43c3c3220669a11aa8487d702ad9ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:58:20 +00:00
TreeHugger Robot
1215a5dff3
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I8e2e6a80985483ea90a3ec2d1727dbc481b3d3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:58:16 +00:00
Bill Yi
16023d11c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours am: 7e6afc5894
-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: Ib7a9462448c27e3a14bb0b99220bdc2a5fc072ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:58:08 +00:00
Bill Yi
6e1b3b15d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: 0e2272c6f6
-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: Ie58fb6523c3541c36417c1decb945010feb56a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:58:05 +00:00
TreeHugger Robot
ff652e848d
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Id37d89f8b7fa6c9c69a67ab67b679ea4ae04f149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:59 +00:00
Bill Yi
76812fbeb1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours am: 89ae91f7cd
-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: Ia07419031ac07860372dfac9a44244c027558b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:57 +00:00
Bill Yi
32a3dfba00
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: 0e2272c6f6
-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: Idc789a5e94653d1c558d61d05a50d5fe3acf2f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:51 +00:00