Jason Hsu
691b1ef4f0
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: c0fb12cf7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: I1aa31319a784f34ea2f405a8e124b060d9423ad9
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:35:05 +00:00
Jason Hsu
cd187d8bed
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: 2fc065c351
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: I787b0707020d38f73f53a0a283272dd074268ed8
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:55 +00: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
2fc065c351
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: If7c97872d17ba3a0e4454d1b9f30b520cbbd81db
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:02:58 +00: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
SongFerng Wang
60f2227360
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 45d498e411
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395
Change-Id: I748fe2f30b3e69bebf67e134d090c88319fb2e29
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:30:52 +00:00
SongFerng Wang
892bafec43
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 9c6211e043
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395
Change-Id: Ifb3e8d06c36a22089261315a7b08dfba152ceb09
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:16:57 +00:00
Jason Hsu
12c10cfa5c
Merge "Correct Magnification shortcut title" into tm-dev
2022-04-26 08:07:37 +00:00
SongFerng Wang
45d498e411
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: Ib83808167690f7b67cef48ef53764a1f7e500897
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:02:48 +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
Chaohui Wang
295d56267e
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 6dc65f1eb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I35b7b67d86557eb9a03d07a62adda253ae22ccc4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:27:36 +00:00
Chaohui Wang
5094979554
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I868e35ed12d7143c6d8fdea63e52feb628163c90
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:27:31 +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
61a35e7b85
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: I71d0c09c5c1419f48bd3dd754eeaafa1acbf17f7
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:52:31 +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
Automerger Merge Worker
3f5b45397a
Merge "Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58" into tm-d1-dev-plus-aosp
2022-04-26 06:28:08 +00:00
Jason Chiu
370c61e339
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: I3b5e38835df123445bf89e270a36b7dd4a759b1b
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:28:06 +00:00
Jason Chiu
ca7d463f4d
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: I524ebc3da76ccac4bbbdaa6c0601c11d8f324379
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:28:05 +00:00
Automerger Merge Worker
d53e79d292
Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp
2022-04-26 06:28:02 +00:00
TreeHugger Robot
7ba258ee83
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: Ie95b750091bf22ac690c73ebb49d63c906e047c2
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:27:59 +00:00
TreeHugger Robot
81f281b6dc
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: I955609258cbd7ab4faeaa0748a13e55fff2e5a03
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:27:59 +00:00
Jason Chiu
b174c6853e
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: Ia100a0ee19b88d603887cad11b1849d1a5b9d2cd
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:12:57 +00:00
TreeHugger Robot
5f3059ff3e
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: Ice45d444bedfecaad34cce27fedd38528cd5ab91
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:12:49 +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
Joshua Mccloskey
eb4fa99d5a
Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796
Change-Id: I6d5b095918d499447fa67f2e0ac2b28345885e32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 21:37:30 +00:00
Joshua Mccloskey
e7c507070d
Merge "Modified Fp -> Face setup flow" into tm-d1-dev
2022-04-25 21:14:39 +00:00
TreeHugger Robot
3f5a3ce250
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: Ic0825c41a3879402d05a27bdffa48678143361aa
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:59:07 +00:00
TreeHugger Robot
7e8278e3cc
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: Id1d714a163113bebcc44243be6f75330b6312039
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:58:57 +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
09c7795dfa
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: I7b6f267436a95259a68e1cfcc7be3545e83e49e1
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:36:52 +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
cfd80d65f0
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I45d7b7dcd48b82d68d80ad72bfa1619ffec831b3
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:57:24 +00:00
Jan Tomljanovic
d6c1353a80
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I66d3322cdc54151f685d31fa71caa0bfeacd0ff3
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:57:20 +00:00
Jan Tomljanovic
2a9fb8aa47
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: I6b8ae6593ba12751b4eb2be7cea75256e18638a9
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:57 +00: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