YK Hung
75238622bf
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: I70e5ed6a5d04f20d0d6364cd3522a35ae0407920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:39:40 +00:00
YK Hung
434009d709
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev
2022-05-05 12:18:10 +00:00
SongFerngWang
e8bb9c9be3
[BT Broadcast Sink] Add the function for leave and scan QRcode buttons
...
Add function for 'leave broadcast' button
Add function for 'Scan QR code' button
Set 'level broadcast' button gray out when device does not have broadcast source
Bug: 228259065
Test: build pass and manually test
Change-Id: Iab4a45e73f49c3f755b95ea3fa38872daac7e745
2022-05-05 18:16:44 +08:00
SongFerng Wang
337bb7cf74
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: e00cbc7885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: Ifb3d2f557370c20df953d752b1ce0281f0deeb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:12 +00:00
SongFerng Wang
c5618a37b4
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
am: 411d3acb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I58c8d789e9e9b01c1e97acebbbf7d7c4503f6d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:03 +00:00
Tsung-Mao Fang
fdf150573f
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: c4613ab0d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: If05e4d9274de4f3c637239c12c751e49c4560179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:47 +00:00
Automerger Merge Worker
1811ddabe3
Merge "[Panlingual] Fix conflict am: 70fe2d1fdd
am: fd09e5c0e8" into tm-d1-dev-plus-aosp
2022-05-05 09:27:29 +00:00
Tsung-Mao Fang
8998aeb1fc
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
am: a0100b2171
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: Ieed25319883b72568c1b1c1421452a49578840ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:24 +00:00
Tom Hsu
e8e612c7d5
[Panlingual] Fix conflict am: 70fe2d1fdd
am: fd09e5c0e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: Ice1bd20d3282d30e53e8bb150bc59437144bd02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:22 +00:00
Tom Hsu
1c154f9197
[Panlingual] Fix conflict am: 70fe2d1fdd
am: c4603be5b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I0bd679552d03be99daf1e31d120626cc8b9d4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:26:24 +00:00
Jonathan Scott
b7f4f56cad
Add missing settings strings.
...
Also re-enable and fix tests.
Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624
Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
2022-05-05 09:12:59 +00:00
SongFerng Wang
e00cbc7885
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I051e905d4a216f57aa2b9244cf93df203b6e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:25 +00:00
SongFerng Wang
411d3acb66
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: Ifeb0c8ee95410f9555650078a396ca0728fb9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:22 +00:00
Tsung-Mao Fang
a0100b2171
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: I8a5a602eb88c8947ad1ba293e3477e05d5c99ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:08:53 +00:00
Tsung-Mao Fang
c4613ab0d2
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: Ib1f9f1895b7555b0a1fdcb42679a12707bbc167b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:08:40 +00:00
Tom Hsu
c4603be5b3
[Panlingual] Fix conflict am: 70fe2d1fdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I73dc18b9f3d456cc1c3569be593f0bec37b61e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:08:28 +00:00
Tom Hsu
fd09e5c0e8
[Panlingual] Fix conflict am: 70fe2d1fdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I51b5f3f60061e41217b277e03686f43fbf85e885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:08:02 +00:00
SongFerng Wang
afe6d302e4
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev
2022-05-05 08:50:20 +00:00
Tsung-Mao Fang
c5153183d8
Merge "Show slice without toggle when there's no wifi permission" into tm-dev
2022-05-05 08:43:00 +00:00
Chaohui Wang
7e47784da1
Fix Voice Access scroll down in the Add network
...
Use single NestedScrollView instead of ScrollView + NestedScrollView.
This also improve the scroll experience when the accessibility service
is off.
Bug: 216573764
Test: manual test when Voice Access on
Change-Id: I9395c1749c9f49086a979057f7ea2f0cda857993
2022-05-05 16:31:08 +08:00
ykhung
be10538a09
Support special tethering and removed apps UID in the usage list
...
There is a special UID for network data tethering usage, we will handle
it in a special case to avoid the current rule considering it as an
invalid UID case without showing in the usage list. We will disable the
click behavior to protect the optimization mode page first.
Bug: 227395125
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I8d96473d382ebc3253748cce8345d6f2261a233d
2022-05-05 16:17:41 +08:00
Milton Wu
130a64779e
Fix Learn more link not work
...
Old span text shall not be used in preference footer. Change
implementation to use footer learnMore APIs
Bug: 228101275
Test: Make sure "Learn more" can be clicked on Fingerprint setting page
Change-Id: Ied2326b1a75fc02e7a3fe2321735f2f9f5ac066f
2022-05-05 15:15:48 +08:00
Tom Hsu
70fe2d1fdd
[Panlingual] Fix conflict
...
- sync code from master to tm-dev
Change-Id: I75b66cd2fa161a6e7c8a9d272b67516ac55e7025
2022-05-05 06:18:22 +00:00
SongFerngWang
1709c80eff
[LE broadcast sink] Add the source list in boradcast sink UI.
...
Add the source list in boradcast sink UI.
Add the password dialog.
hsv link1: https://hsv.googleplex.com/6256032201310208
hsv link2: https://hsv.googleplex.com/5934966820044800
hsv link3: https://hsv.googleplex.com/6238095344140288
Bug: 228258236
Test: manual test
Change-Id: I698c2f7aba9baa9f143a98629b8796eda57fb379
2022-05-05 06:00:45 +00:00
Automerger Merge Worker
363b525796
Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2
am: 1737ce56fc" into tm-d1-dev-plus-aosp
2022-05-05 05:26:24 +00:00
Daniel Huang
03a2775a32
Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2
am: 9a339e9d16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867
Change-Id: Ife440db792f001864f3305eed6e3e2200e269d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:26:18 +00:00
Daniel Huang
e7490f41a3
Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2
am: 1737ce56fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867
Change-Id: Ib25ff5bf58f9b3bee0d414e5fe71e38b80c97fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:26:18 +00:00
Daniel Huang
9a339e9d16
Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867
Change-Id: I1384bf966c0afc391f97d64c389747fe307497cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:09:48 +00:00
Daniel Huang
1737ce56fc
Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867
Change-Id: Ifb20f828c374e2a003d9d0b0f6af98ab50810afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:08:22 +00:00
Tsung-Mao Fang
cb641fa6eb
Show slice without toggle when there's no wifi permission
...
When the presenter app doesn't have certain permissions,
it's safer to go with a generic fallback slice
which just redirects user to the actual settings page.
Test: test on the presenter app. robo test
Fix: 178014725
Change-Id: I6f5358af2e00cb2fedba0b3f1474a026135986c6
2022-05-05 12:05:38 +08:00
Daniel Huang
74b1027fe2
Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev
2022-05-05 03:46:47 +00:00
Jay Thomas Sullivan
5efeddcdbe
Add PRIVACY_ADVANCED_SETTINGS intent
...
Redirect intent actions for PRIVACY_ADVANCED_SETTINGS to the privacy
screen.
Rationale:
1. The existing PRIVACY_SETTINGS intent will later be redirected to
safety center, but
2. We will still need a way to intent to this screen, because this
screen will be re-used and renamed to "More privacy settings", also
known as "Advanced privacy settings"
Test: manual
Change-Id: I83cb3935e16887683f3907d9d71ccd7c53e24202
2022-05-04 22:14:12 +00:00
Xin Li
e5d25d91a6
[automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455
-s ours am: 2a6d8885bc
-s ours am: 9895e8e63b
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2085885
Change-Id: I89ef935da4e4cd866d0300ab387aff6a1ef23072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 21:28:29 +00:00
Xin Li
92e90faa5c
[automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443
-s ours am: 90645fb925
-s ours am: 6c49c6dbcd
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2085885
Change-Id: I20d6a10afd7b33ce095b5d1b847995d64d1a0b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 21:28:18 +00:00
Xin Li
9895e8e63b
[automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455
-s ours am: 2a6d8885bc
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2085885
Change-Id: I9ee9deabfbe58ece7df81f88733417d5b733898b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 21:20:20 +00:00
Xin Li
6c49c6dbcd
[automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443
-s ours am: 90645fb925
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2085885
Change-Id: Iec2ab168e50ca7aecbe67626131c46b7d576a439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 21:20:09 +00:00
Xin Li
2a6d8885bc
[automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2085885
Change-Id: I1328a5b1eec08a2d30940f610911af8978153c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 20:57:11 +00:00
Xin Li
90645fb925
[automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2085885
Change-Id: Ib4481f34e89f88b1a74baebdc5499460fe10b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 20:56:53 +00:00
Xin Li
8adb561455
Merge "Merge SP2A.220505.002"
2022-05-04 20:30:21 +00:00
Julia Reynolds
4138b6f68a
Remove notification permission feature flag
...
Tes: Settings notification robotests
Bug: 231344755
Change-Id: I3e35eede94ea88bee4c2e7fc03ce998ed68b4f81
2022-05-04 16:24:23 -04:00
Raphael Kim
ff34195604
Extract app label from component name in notification access confirmation UI
...
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
2022-05-04 19:41:13 +00:00
Bill Yi
4d6d37508c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4
-s ours am: 7034e737b6
-s ours am: 5a078b4970
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: Icc4eea9c6cd7482159d32fe35a6502a52199df98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 18:13:33 +00:00
Bill Yi
f8855596aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4
-s ours am: 7034e737b6
-s ours am: 8b81a28364
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: I44ae32c94533d3e215397ffcb66fdbc155505f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 18:12:58 +00:00
Automerger Merge Worker
9414c443d5
Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f
-s ours am: 6b59002229
-s ours am: 799c8e2d7e
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106
-s ours am: da1aaa3069
-s ours am: 7463359b05
-s ours
2022-05-04 18:01:06 +00:00
Bill Yi
aa298f73f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f
-s ours am: 6b59002229
-s ours am: 799c8e2d7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393
Change-Id: I542bc948ec4da5ce8d7bc491b72b4f931f7afb57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 18:00:17 +00:00
Bill Yi
5c00707228
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106
-s ours am: da1aaa3069
-s ours am: 7463359b05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393
Change-Id: I7b1513a861a8413f7a65f852fa7a784795fa3c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 18:00:01 +00:00
Bill Yi
5970cabb76
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f
-s ours am: 6b59002229
-s ours am: 467d913a6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393
Change-Id: Iad70f6ca2f6d70770174b33a9e36ceb33f1d0586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:59:28 +00:00
Bill Yi
670172f665
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106
-s ours am: da1aaa3069
-s ours am: 71fc7ec758
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393
Change-Id: I3337a972e148987070b04f0ccdc4908c56772d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:59:13 +00:00
Automerger Merge Worker
4491a88ed8
Merge changes from topic "am-9fa7d80b21934066ba9777d72c99d3a2" into tm-d1-dev-plus-aosp
...
* changes:
Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf
am: a467f9dcba
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
am: c50bf31396
-s ours am: 58da6d7afd
-s ours
2022-05-04 17:58:28 +00:00
Bill Yi
5dcf0e73a7
Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf
am: a467f9dcba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: I1db50089f8beec126b483e113d39022a0e0813e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:57:50 +00:00