Commit Graph

103179 Commits

Author SHA1 Message Date
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
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
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
571ef48801 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ib1cf8d4fbfeaee40c46574d995c112341bdb3b5a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 11:03:52 +00:00
Betty Chang
af1e12cf26 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: Ieb87da91f486efe72ef5cff43aa99982e8ad9f9f
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:57:16 +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
031dfc79a9 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: 89f5d2d442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: I0d3bb825b7f11c4763b3ad1762eb4edc07ecfc8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:08:58 +00:00
Jason Chiu
89f5d2d442 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: I6944c307eba807fc351a0acd404edac6ddd1e22b
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:46:48 +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
2f29b5be0f Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: 78a9701de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: I413c08fc365319302f5a5885c846523404e1f942
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:14:01 +00:00
Prabal Singh
c771c8bf94 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 am: 888deb9328
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: Ie60a5a246352930881c50774b61197ced7f7c5ce
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:13:53 +00:00
SongFerng Wang
78a9701de0 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: I91a231d6c86a2f594feb5eb9604653247273e6ae
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:49:45 +00:00
Prabal Singh
888deb9328 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: Ic3d77ecb6d22e632feefc75773b84e6d7da270c8
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:49:38 +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
Jack Yu
bf3a207fb5 Change the alignment of the foreground preferernce controller
Set left align to the nfc foreground preference controller.

Bug: 223073535
Test: manual
Change-Id: I0d4ffcedb2646b9d3fd7f4d56adb0d000cfd5987
2022-04-25 15:27:05 +08:00
Jason Chiu
9c1a1cb884 Relaunch the account page after removing a work account
Removing a work account goes back the previous page.
However, this closes Settings app in dual pane mode since the account
page is in the 2nd layer.

Bug: 223755141
Test: manual, robotest
Change-Id: I40407cb052c0474f62254bcb2216e33496c901c8
2022-04-25 12:39:51 +08:00
Arc Wang
a72a931706 Fix 'Documents & other' missing problem am: 03b1b23c74 am: a3b164bcc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929

Change-Id: I662f75beb94a6e75c3208f9098e9027d4f71cf07
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:18:05 +00:00
Arc Wang
a3b164bcc4 Fix 'Documents & other' missing problem am: 03b1b23c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929

Change-Id: Ibe6da087880153d6da8e3ab4827768300f4a1076
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:54:00 +00:00
changbetty
d1d9798a5d [LE Audio] Add entry point in Media Volume slice for broadcast sink
Bug: 228274114
Test: make RunSettingsRoboTests
Test: Manual test
Change-Id: I331232c30291348faf7166d4de8060a1cfe12bff
2022-04-25 02:42:46 +00:00
jasonwshsu
e48ebb9755 Correct Magnification shortcut title
Root Cause: Magnification has its own ShortcutPreference, but we did not
update correct title with getShortcutTitle()

Solution: Call setTitle(getShortcutTitle()) in initShortcutPreference()

Bug: 228752572
Test: manual test
Change-Id: I85b09a22032bad0a0c840590a98be88538a0499b
2022-04-25 02:53:15 +08:00
Bill Yi
0c2f84941f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9751d68c866e0a2d4fb7875884e506a0406c24e5
2022-04-24 11:07:35 +00:00
Bill Yi
35705d94c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7f7b9a0d0a9e6a46aa83fb414c35f71012b80d86
2022-04-24 10:59:49 +00:00
Bill Yi
3f51a847ff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic5d11353374e71949e9ef2300c55c90958c2cb06
2022-04-24 09:15:34 +00:00
Arc Wang
03b1b23c74 Fix 'Documents & other' missing problem
Should check if 'Documents & other' is visible
when mVolume is updated.

Bug: 230215783
Test: manual visual
      Settings -> Storage
Change-Id: Ife36b71bee66ff16802e352785824e10c17dceb8
2022-04-24 15:30:16 +08:00
Prabal Singh
67007e5933 Use settingslib util methods for work policy info
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
Will
640247eb58 Disable screen saver setting for non-system users.
On devices where non-system users are not allowed to dream, disable the
screen saver setting when the current user is not the system user.

Bug: 213906883
Test: atest ScreenSaverPreferenceControllerTest
Test: Manually with the following steps:
Step 1: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser set to false, make sure that
non-system users can still access the screen saver setting.
Step 2: On a device with the config setting
config_dreamsOnlyEnabledForSystemUser setting is set to true, make sure
that non-system users can not access (or see) the screen saver setting.
Step 3: Make sure that system users can still see the screen saver
setting on a device where config_dreamsOnlyEnabledForSystemUser is set
to true.

Change-Id: I7e167ed5a1ea183c725ba89a57b8d0b372064b82
2022-04-22 16:03:31 -07:00
Joshua McCloskey
d3001a1a01 Fix final UDFPS enrollment haptic.
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes 229804277

Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
2022-04-22 21:06:21 +00:00
Nate Myren
d1749cfbab Allow intent into Privacy Controls page
Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
2022-04-22 13:58:50 -07:00
TreeHugger Robot
32f8460aac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3624b9a2ef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846023

Change-Id: I363d10e518483394ead5bcc4bf6e7f35f663f434
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:44:36 +00:00
Bill Yi
a3fdaece70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8460461f4d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846023

Change-Id: I5ad6e33af4bad2d9a9d4d006b21d4f6e005b2f21
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:44:08 +00:00
TreeHugger Robot
8c759d6469 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a6e5d0b0b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845818

Change-Id: I2433ce74a331e7114970e3014cf54ffab3385cdc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:43:46 +00:00
Bill Yi
5fb0418563 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e411e93e7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845818

Change-Id: I4e13760430a92441037a847f37ae9d0cd1945942
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:43:26 +00:00
TreeHugger Robot
3624b9a2ef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-22 18:56:18 +00:00
TreeHugger Robot
7a6e5d0b0b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-22 18:56:18 +00:00
Ricky Wai
cbeee15903 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Ic8af009c1dd59d59d45139379c2d66c4d8992baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:44:59 +00:00
Ricky Wai
8f61acd8c2 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I8342a30b9e86699fcce7f8f5858572def92c30ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:18:58 +00:00
Ricky Wai
fd7153ed39 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev 2022-04-22 14:53:00 +00:00
SongFerngWang
b76feffe4f Gray out the network mode UI before the carrier config is ready
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
Bonian Chen
aeac0619df [Settings] Code refactor for combining TelephonyCallback with Lifecycle
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.

Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
(cherry picked from commit 7c5259efad)
2022-04-22 10:39:04 +00:00
TreeHugger Robot
5df4451e95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours am: 5c7d0155a8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I89d3af3b6ef6b6761ad7f964a26dfb7b2c3d1285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:56:58 +00:00
Bill Yi
2d57766d2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: e74c40fc84 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I31d7b6851adec96ae762d12456497cf5d742ed3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:56:42 +00:00
TreeHugger Robot
5c7d0155a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: Ie68d6b19f8c300ed29b40d45f4e50cf92718a5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:19:41 +00:00
Bill Yi
e74c40fc84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I4826b58bb2c00972c0ed25f0db452c6fd37914d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:19:22 +00:00
TreeHugger Robot
7d5cc42c81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: Id2024b4c9ab3d5bc9efd2985847f0396112ef464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:52:28 +00:00
Bill Yi
f1b797ac9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I1d0c3fd484331c7cd7e1d55106fd1c89c67da57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:52:01 +00:00