SongFerng Wang
a9b22228bf
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
am: 80c326e316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I87e5c30e2bb0d5bb3c22c4ce6e68759af8adbd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:38:22 +00:00
Ayush Sharma
b0aa6420d9
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
am: 2f5f7c96d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: I38278d4d0cb469c5f2c0dcb757b690776d8eedfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:38:16 +00:00
SongFerng Wang
80c326e316
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: If732e278300370c10c61b52e347f79c8d9656a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:10:29 +00:00
Ayush Sharma
2f5f7c96d1
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ieaafe1022101cc6d66e5e3518846e3c68b71cd24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:10:14 +00:00
SongFerng Wang
286682ec8a
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev
2022-05-06 11:08:21 +00:00
Ayush Sharma
6e4579a816
Merge "Move set work lock message from header to footer" into tm-dev
2022-05-06 10:42:10 +00:00
Arc Wang
61ad24e8c4
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
am: 80d5ebdf8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098
Change-Id: Iedddeba25cbe6364197c84746f219a33dbda8576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 10:13:04 +00:00
Arc Wang
80d5ebdf8d
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098
Change-Id: Iaf4585840b034fed6411e34a793fb57c5176ea30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 09:50:08 +00:00
Arc Wang
64b42270ab
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev
2022-05-06 09:24:42 +00:00
Arc Wang
358dd2b494
Revert "Prevent side channel package installation enumeration"
...
This reverts commit 263592e3dd
.
Reason for revert: <To fix test breaks b/231461076 & 231164585>
Bug: b/231461076
Bug: b/231164585
Change-Id: I29211e5de9d7edef8c61125b8be047b6247c8773
2022-05-06 04:07:50 +00:00
Yi-Ling Chuang
db73382e8b
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
am: 0fddcd3f80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I69ffdeda8f6accb6557395e4725a45aa2d1b2aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:53:27 +00:00
Yi-Ling Chuang
0fddcd3f80
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I2802a6770e187e6ac8d2f76286f0ffa0ee5adac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:33:57 +00:00
Yi-Ling Chuang
9a14f087cd
Merge "Show previous query upon configuration change" into tm-dev
2022-05-06 03:17:22 +00:00
TreeHugger Robot
1d27f67bfb
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
am: a64b3585c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I2bf19dba3f1361116735868b8452c72cf7069293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:00:47 +00:00
TreeHugger Robot
a64b3585c2
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I7830bae523e7fe0464af2c4ff821c87e46ca4a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 02:42:35 +00:00
TreeHugger Robot
b2dd7913c0
Merge "Fix Learn more link not work" into tm-dev
2022-05-06 02:27:19 +00:00
David Coffin
55f64671d2
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
am: e65b3bda30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: If1ecbdb76c24ef61371dec06434ef53f6e75a26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:28:29 +00:00
David Coffin
e65b3bda30
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704
Change-Id: Ided2edcaf54e253e9abe20951d4d283510b9b4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:10:55 +00:00
David Coffin
bf2bec34e0
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev
2022-05-05 20:34:00 +00:00
TreeHugger Robot
036373b278
Merge "Add missing settings strings." into tm-dev am: af5a015198
am: f01fbbcec3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: Ia062145408e033588a1478b341e7a6c91738ea16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:06:01 +00:00
TreeHugger Robot
f01fbbcec3
Merge "Add missing settings strings." into tm-dev am: af5a015198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I1c10f70954313ca7a15cd83e8d0663440fb1d3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:44:42 +00:00
TreeHugger Robot
af5a015198
Merge "Add missing settings strings." into tm-dev
2022-05-05 13:19:07 +00:00
YK Hung
f623e0a8d3
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
am: 5f597a5f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: I519da4dafa403606a6c197bb9c8ab56e3eaf9770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:10:39 +00:00
YK Hung
5f597a5f18
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: Id5e216edab65a83c6c7836e719e8dd11c500acb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:41:20 +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
6e60b53542
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: I04a8820ecc9e3757bd58a49e4e451cc7a004e9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:07 +00:00
Tsung-Mao Fang
f9edc98ba7
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: I09616381905908cfebdc0bcb0bced2f6d8176340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:56 +00:00
Tom Hsu
e74b7edb7c
[Panlingual] Fix conflict am: 70fe2d1fdd
am: c4603be5b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: I8154923e9e3db1e4984889d648cf0cfa17e65348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:26:43 +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
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
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
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
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
Daniel Huang
62715a9cdd
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: Ic91f10bc276e2d108739cbfc8df5b115e2fdf667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:26:25 +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
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
Bill Yi
b84b97b153
[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: Iddfa053dfa622e9943e3d6363d6768f0a1ae20f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 18:12:55 +00:00
Bill Yi
b506123bad
[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: Ib8027d69cf70a5afabcacd0f97a200ee06222b88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 18:00:13 +00:00
Bill Yi
649022d0f9
[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: Ifca310ffea5b59ef7ff47b036d4e02254b232b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:59:56 +00:00
Bill Yi
4872c85344
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: Ia33ce6c8b40831d506ae00da3b9a6833e418de89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:57:04 +00:00
Bill Yi
8cd5792307
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
am: c50bf31396
-s ours am: 58da6d7afd
-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: I72d43c17448a40f5ec5bd96576a6e78df5c4667b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:56:59 +00:00
Bill Yi
5a078b4970
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4
-s ours am: 7034e737b6
-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: I887b8dd450faf42fbf9d8886bfa7108572921d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:47:53 +00:00