TreeHugger Robot
37c4a74b27
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-27 02:31:39 +00:00
TreeHugger Robot
e26c4e41ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I50c8e8a036ba16be1de8ddd2f7933615a51ac94d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:19:48 +00:00
Bill Yi
a344350db7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I948f2dc9f4c7ffbd63bf0b56391192f221eddb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:19:33 +00:00
TreeHugger Robot
1f6b29b35a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I4907deaeaf6cf14c6f22f8ee58036ca33e7782ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:59:23 +00:00
Bill Yi
7146184316
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Id264da7161d5c6f04fcbc948596e8b2c376047f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:58:57 +00:00
Bonian Chen
4e32727c01
[Settings] Link to incorrect SIM after SIM swap
...
A click to the UI presented on screen should take user to the exact SIM
that clicked instead of the first SIM presented to the end user (and
could no longer available).
Bug: 227273792
Test: local
Change-Id: If5a33f72e5730911af61f20a6a45a40cafb956d0
2022-04-27 08:55:45 +08:00
TreeHugger Robot
daf63cf01e
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: Ibcf50a295606d3e3b03dead22a1f4423cafb1e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:40:11 +00:00
TreeHugger Robot
3e8135ea74
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-27 00:39:28 +00:00
Bonian Chen
3bddc056d8
Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"
...
This reverts commit aeac0619df
.
Reason for revert: merge failure in other branches
Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
2022-04-27 00:03:20 +00:00
TreeHugger Robot
a72b9398fb
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev
2022-04-26 23:45:12 +00:00
Bill Yi
cb6059d24d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours am: fa497ab8af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I28db6646b415272be6807778e135a7923d87e3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:08:58 +00:00
Bill Yi
fa497ab8af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I37b7ef953f06dedbfd1aae0f3c75ae9f3f86daa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:01:50 +00:00
Yuri Lin
e540c8165d
Fix ZenModeScheduleRuleSettingsTest to test onAttach
...
this follows the model of the change to ZenModeEventRuleSettingsTest in ag/17607148
Fixes: 215062934
Test: settings robotests
Change-Id: I44abec9316f78be318b51ba541d20b863eb86c8d
2022-04-26 14:23:06 -04:00
Bonian Chen
1d1c2826c9
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: I334058bf9a010783514ab685885c9c6c8d86cc8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:34:33 +00:00
Bonian Chen
6483721f20
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597
Change-Id: I1d5d21181e8675669ce2eec07995105c82dd947b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:34:16 +00:00
Bonian Chen
73c8e2f45a
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev
2022-04-26 10:25:31 +00:00
Bonian Chen
3fc05a917e
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev
2022-04-26 10:25:02 +00:00
Arc Wang
263592e3dd
Prevent side channel package installation enumeration
...
From Android 11, apps need the permission QUERY_ALL_PACKAGES
to probe existence of arbitrary installed packages.
However, an Activity which declares android:scheme="package
in intent-filter may be vulnerable and attacker app can
use it to probe installed packages.
This change add permission QUERY_ALL_PACKAGES to protect
vulnerable Activity.
Bug: 185477439
Test: Install POC and check if it can probe installed packages
by each vulnerable Activity.
Change-Id: I521545436102f72f2e0c5053e30fd03bd6bc756f
2022-04-26 18:15:17 +08:00
Alex Johnston
e8bbf576c9
Fix USB tethering grey out behaviour
...
Grey out USB tethering when USB is disconnected
Bug: 200113957
Bug: 223477825
Test: Manual testing with TestDPC
Change-Id: I40eb04d6e96f4963129dc9d6dc9001b0c54185ef
2022-04-26 10:18:01 +01:00
Jason Hsu
c0fb12cf7c
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: I5370613843e746c5c0c71f5da9155612d97f34dd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 09:01:42 +00:00
Jason Hsu
12c10cfa5c
Merge "Correct Magnification shortcut title" into tm-dev
2022-04-26 08:07:37 +00:00
SongFerng Wang
9c6211e043
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395
Change-Id: Id978d5b9524984ab553bc301fa6b6173afcb56ec
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 08:01:34 +00:00
changbetty
2818dedc28
[LE] Launch the MediaOutputBroadcastDialog when the current device is
...
broadcasting
Bug: 229577323
Test: Manual test
Change-Id: I0bfc9ecac2a0b6d68d41c4d17d4642f927581ccb
2022-04-26 07:47:23 +00:00
SongFerng Wang
1bc142776c
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev
2022-04-26 07:36:28 +00:00
Weng Su
71b9cc0e32
Check Wi-Fi permissions for QrCode scanner
...
- Launched package require ACCESS_WIFI_STATE and ACCESS_FINE_LOCATION permissions to get results
Bug: 187176859
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest
Change-Id: Ie80c4e5b3a5863749de518e4736873390478816e
2022-04-26 07:10:57 +00:00
Chaohui Wang
6dc65f1eb4
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: Iea7bef3ceebeb17a54314389a1314a378d383d5c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:51:16 +00:00
Chaohui Wang
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +00:00
Jason Chiu
5fe986be58
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: I227ce218c0b7096412012ec04c356fa60e908882
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:11:40 +00:00
TreeHugger Robot
734ada269b
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: I5e3948fb746aa2eb485cc0a2113f9f06a4ed234f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:11:31 +00:00
Jason Chiu
81ee2037ed
Merge "Renew the highlight state color" into tm-dev
2022-04-26 06:08:40 +00:00
TreeHugger Robot
5a083d2bfe
Merge "Change the alignment of the foreground preferernce controller" into tm-dev
2022-04-26 05:44:37 +00:00
Ben Murdoch
cab2b2c4d0
Fix NPE in Bluetooth Settings.
...
Bug: 230347816
Test: Manual
Change-Id: I210ce81217466897c59509a31fb53d57eed71118
2022-04-25 18:40:54 +00:00
TreeHugger Robot
6abf8e2f78
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: I1931a6139fd93fe5781a1743b695a36ddc0c8579
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 18:35:50 +00:00
TreeHugger Robot
5d218d9fa4
Merge "Allow intent into Privacy Controls page" into tm-dev
2022-04-25 18:09:39 +00:00
Jason Chang
f38cec326a
Fix the description of one-handed mode doesn't change immediately in
...
Gestures page after users turn on/off in Quick Settings
Add ContentObserver URI for observing when settings key
"one_handed_mode_enabled" changes.
Bug: 230041450
Test: manually verified on System > Gestures >
One-handed mode item when turned on/off in Quick Settings
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.
OneHandedEnablePreferenceControllerTest"
Change-Id: Id6bb53692181dfc3c8a1006017b5a22462dc4ad9
2022-04-26 01:50:43 +08:00
Lais Andrade
cc8790f7b3
Create separate On/Off string resources for Vibration & haptics
...
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.
This change separates this resource string from the more generic one
that was used before to allow this flexible translation.
Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
2022-04-25 17:15:39 +01:00
Jan Tomljanovic
a474c51a04
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I070dae172e3998101c04bc58edccf3aed262840b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 14:23:05 +00:00
Jan Tomljanovic
e22fa138aa
Merge "Don't show back arrow in Security when in split mode." into tm-dev
2022-04-25 13:52:31 +00:00
SongFerngWang
e5fff060a2
[MEP] show the DSDS mode selection dialog for user when user insert esim
...
If device has esim, then user inserts esim in SS mode. Then, UI should show
the DSDS mode selection dialog for user.
Bug: 230050990
Test: build pass and manual test.
Change-Id: Ia4e695ae2c4e86d6039e03738378989a0879cc71
2022-04-25 21:07:26 +08:00
Chaohui Wang
f250493787
Update Personal / work selection UI.
...
Implement the new-look by using AlertDialog's
custom title and custom view.
Using the RecyclerView so we can display profile
horizontally.
Bug: 174626616
Test: manual & robolectric
Change-Id: I9f5a7685d9217fc62e01799ad73f9b9a3ddbf19a
2022-04-25 19:12:38 +08:00
Betty Chang
21b9bb97d9
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Ieba054b1692260cee393b2b18554de4fe31df46f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 10:55:51 +00:00
Betty Chang
662a45bc0a
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev
2022-04-25 10:39:42 +00:00
Jan Tomljanovic
ef817325bc
Don't show back arrow in Security when in split mode.
...
Test: manual
Bug: 224427042
Change-Id: I0b0daa3981c56ba99bebda2cd34a51f3877f37a6
2022-04-25 10:37:55 +01:00
Jason Chiu
a9b11b0a64
Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931
Change-Id: I58c3cd1c3ec201afea0b4189eeef6c2005780e8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:45:29 +00:00
Jason Chiu
346a40a6f5
Merge "Relaunch the account page after removing a work account" into tm-dev
2022-04-25 08:28:43 +00:00
SongFerng Wang
750359c7ef
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: If727840e74fdc94efc05e9161c8662beca653ca6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:48:34 +00:00
Prabal Singh
a3bb653569
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I00659bd11958275081e038dbe67c8fb8481df96b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:48:19 +00:00
SongFerng Wang
564c88485a
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev
2022-04-25 07:40:43 +00:00
Jason Chiu
880471a1b0
Renew the highlight state color
...
Fix: 230283855
Test: visual
Change-Id: I725422518d07a0b0676731bd9da8384ab149ab1b
2022-04-25 15:34:42 +08:00
Prabal Singh
591c2c3b38
Merge "Use settingslib util methods for work policy info" into tm-dev
2022-04-25 07:33:09 +00:00