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
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
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
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
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
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
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
Bill Yi
799c8e2d7e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -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: I535e68e76c490fc74e867219171cc676f8573e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:46:51 +00:00
Bill Yi
7463359b05
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -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: I3e280a5b5b24cee615f9997de42e829c63edd7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:46:35 +00:00
Bill Yi
7034e737b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -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: Iad59e7632d6735b20e2400ae8fc33aee9dff6fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:43:53 +00:00
Bill Yi
a467f9dcba
Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: I3e0f7907f7836ab2edb63dba3d4deeb431913b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:41:07 +00:00
Bill Yi
58da6d7afd
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -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: Ib180e8d399762411648d527ba4075f8b152f18da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:41:00 +00:00
Bill Yi
6b59002229
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -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: I2e1f7b6a32e9e4261c6c512caa74d7a4f3aa69f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:40:48 +00:00
Bill Yi
da1aaa3069
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -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: Ic359719019638ea11ed7571906b3e04af3f5890f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:40:21 +00:00
Bill Yi
261936eccf
Merge changes from topic "tc_change_21" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
Import translations. DO NOT MERGE ANYWHERE
2022-05-04 17:07:37 +00:00
Bill Yi
8c0d18ada4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-04 17:07:37 +00:00
Bill Yi
9349330a1f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-04 17:04:03 +00:00
TreeHugger Robot
5a138163b4
Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802
Change-Id: I21294fc5b06c6eaaf512cdb84d5c83f318baa140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:32:18 +00:00
TreeHugger Robot
d5f1760bc2
Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762
Change-Id: I2b49fcfb402b1269c38c35f840d8d09e53dacb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:30:58 +00:00
TreeHugger Robot
3fb9c1a24b
Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev
2022-05-04 16:01:35 +00:00
TreeHugger Robot
2e6d03d0f4
Merge "Remove Wi-Fi toggle in settings search" into tm-dev
2022-05-04 15:51:34 +00:00
danielwbhuang
a5ef37752b
[Panlingual] Unit test for onLocaleSelected
...
Add unit test.
Bug: 224724840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppLocalePickerActivityTest
Change-Id: Iabbf84d58d5c325b15d960d63aeda0f7ca7af00b
2022-05-04 17:51:01 +08:00
Chaohui Wang
c2ff0c7b74
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I0c1cc0c3dce818db23d6de7dbb1b99445aebae72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:02:04 +00:00
Jason Hsu
f754ec4926
Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126
Change-Id: I6e4aed7dd26965353730339420a7b7fc5bdedbab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:00:56 +00:00
Edgar Wang
e1c20560d4
Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789
Change-Id: I5e9822ac867c84f31928eb8c3835adc666ce6b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 08:58:38 +00:00
Chaohui Wang
22cda47705
Merge "Fix a11y label for LE Audio Battery" into tm-dev
2022-05-04 08:28:00 +00:00
Jason Hsu
c53c5a906f
Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev
2022-05-04 08:03:58 +00:00
Edgar Wang
1098684b19
Merge "Adjust profile category padding in factory reset page." into tm-dev
2022-05-04 07:39:53 +00:00
Chaohui Wang
e5c954ceb3
Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785
Change-Id: I18cca83d0d7836df97668a14426588dfd9ce06a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:42:24 +00:00
YK Hung
082c193751
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: Ia40a2a689b005e2362909cc293573d89a3f42639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:42:17 +00:00
Chaohui Wang
122d28ea09
Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev
2022-05-04 06:37:25 +00:00
YK Hung
eb4acf8435
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev
2022-05-04 06:19:43 +00:00
Chaohui Wang
ca4920090f
Fix a11y label for LE Audio Battery
...
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.
After fix, "Left" & "100% battery" are grouped together.
Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
2022-05-04 14:17:26 +08:00
TreeHugger Robot
680e9f0a0f
Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628
Change-Id: I80db9f0bda301b4f1b8d9e309e970ca7ba05f93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:51:24 +00:00
TreeHugger Robot
756ed72913
Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev
2022-05-04 04:47:44 +00:00
PETER LIANG
e07c557ed6
Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784
Change-Id: I1b585ea03e075873011320f175a6cc48a18d7526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:15:09 +00:00
PETER LIANG
3ba4d5876d
Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev
2022-05-04 04:10:05 +00:00