Quang Luong
aa7a544c93
Merge "Use WifiEntry.getBandString() to show band for Frequency preference"
2022-04-28 20:29:40 +00:00
Lais Andrade
82a3146c23
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: c09c49fcf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: I4a46a73c2901720829056efa3c5d70ad89fb1114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 00:15:40 +00:00
Alex Johnston
8742f0bf9d
Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: 6509505975
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005
Change-Id: I3ff0a70e17e7366ec1c1b4c95400b5482d61ef85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 00:09:46 +00:00
Weng Su
ff3ced78f9
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 37169b93d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I398c19e8f68b32f47742c0c864ae57b69e30c426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 23:49:41 +00:00
Stanley Wang
211b4fa498
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 07b4f09127
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: I2b12337792b23962198e3ecbcf7823a441ab8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 23:49:28 +00:00
Hugh Chen
0c128aca74
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 681d69b2b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I72fc05a7068125f4c6b68ab27b3a1532ef5f61c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:50:51 +00:00
TreeHugger Robot
7d99d82233
Merge "MainClear: remove obsolete check for multi-volume FDE"
2022-04-27 18:42:32 +00:00
TreeHugger Robot
b0b62f812b
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 am: c05c41717e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: Ie172ade12edeae024b1ad3eb90d72848be57837c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 18:32:53 +00:00
Lais Andrade
9c8d1e94fb
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev
2022-04-27 13:54:13 +00:00
Alex Johnston
7828dda503
Merge "Fix USB tethering grey out behaviour" into tm-dev
2022-04-27 10:21:50 +00:00
Weng Su
b6629ab55b
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev
2022-04-27 09:33:26 +00:00
Stanley Wang
17365c8e47
Merge "Fixe the problem of invalid switch preference" into tm-dev
2022-04-27 07:00:10 +00:00
TreeHugger Robot
c28169adb9
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev
2022-04-27 05:56:10 +00:00
Hugh Chen
ec5aa12cec
Merge "Fix NPE in Bluetooth Settings." into tm-dev
2022-04-27 04:00:33 +00:00
Stanley Wang
031cda05c3
Fixe the problem of invalid switch preference
...
- SettingsMainSwithBar will be recreated after the page is resumed.
We should keep the OnMainSwitchChangeListener for
SettingsMainSwitchPreference and re-register the listeners after
the page is resumed.
Fix: 228930107
Fix: 222384287
Test: Manually test and see the UI
Change-Id: I9b57053989e611288cf4814b2a0ecbf9e3c55145
2022-04-27 03:41:06 +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
Jason Hsu
2482997860
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: fd112cd79b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: Ie0f6543f8f8e895581ba257203af14082f409298
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:27 +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
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
SongFerng Wang
0064079c53
Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 33887c1233
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395
Change-Id: I937cb30ac6c2fed7b2d7dcee0afbeaf63fc78a42
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:25 +00:00
Jason Hsu
12c10cfa5c
Merge "Correct Magnification shortcut title" into tm-dev
2022-04-26 08:07:37 +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
815ee3779b
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 334335bc6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I87294478784f6518f58e57aaeba0eef5af5b0297
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:26:55 +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
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +00:00
Jason Chiu
704689ab04
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 50893331e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: I0ded6982be5c1d1334eaf8157de629505a1ebcf8
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:38 +00:00
TreeHugger Robot
68bb261092
Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 4e3f5c9253
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933
Change-Id: I13ec576dbf17d1907006d0214d0a80738b4a6489
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:30 +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
Hugh Chen
00a8568b1b
Merge "Implement advanced vpn ui in vpn settings"
2022-04-26 05:33:27 +00:00
Eric Biggers
8c25415736
MainClear: remove obsolete check for multi-volume FDE
...
It is never the case that '!isExternalStorageEmulated() &&
!isExternalStorageRemovable() && isExtStorageEncrypted()', so stop
checking for this.
It's easy to see that even just the last part, isExtStorageEncrypted(),
is never true, since it checks whether the property "vold.decrypt" is
non-empty. That system property was only set on devices that used FDE
(Full Disk Encryption), and FDE support was removed in Android T.
Moreover, the full condition of '!emulated && !removable && FDE'
actually checked for devices that used multi-volume FDE, which
apparently was never actually used, and was removed 8 years ago by vold
commit 87999173dd79 (http://ag/423222 ). This is consistent with the
fact that this code was added 11 years ago by commit 2a32192329
(http://ag/134210 ), when probably this feature was still planned.
Bug: 208476087
Change-Id: I4c2b5c9aed8812367a70d0dd1bbcc94008fec529
2022-04-25 23:15:31 +00:00
Joshua Mccloskey
8d094ff541
Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f am: 872c5b533c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796
Change-Id: Ife81fcfe043fb74098f94e25d58c01117362ac6e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 22:31:29 +00:00
Joshua Mccloskey
872c5b533c
Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796
Change-Id: I67b2e8a129697483bd0f0a410284efb9a61fdb5f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 22:00:21 +00:00
Joshua Mccloskey
0a41ad016f
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: Ia50eaa82757cb61f1851bfa7c5e352646076162f
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:13 +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
394c83c085
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: bc6d056015
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: I94e6a462619de1b26c9e1fe8d357913139782823
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 19:15:37 +00:00
TreeHugger Robot
bc6d056015
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: Ic3ea00d800f8baf0432d10be1900245a5749393d
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:00 +00:00
TreeHugger Robot
b2744ea5b2
Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 62b2539aae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639
Change-Id: Id7773c5410e672ec08cc2e0d7a05acf0117706ef
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:28 +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
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
df90e9b05f
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: 66d62cb61e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I8d019b8af584bc5df1ee4c7d9d315a19e4703050
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 15:12:43 +00:00
Jan Tomljanovic
66d62cb61e
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: I85990569eb583b2ca2df96eca5a536ecfdc6bdbc
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:45 +00:00
Jan Tomljanovic
aac9102d75
Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 70c4143751
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206
Change-Id: I0d1e49ca3b154d521897c15595614e0846609234
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:56:44 +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
e22fa138aa
Merge "Don't show back arrow in Security when in split mode." into tm-dev
2022-04-25 13:52:31 +00:00